mm-balance 0.1.19__py3-none-any.whl → 0.1.20__py3-none-any.whl

mm_balance/config.py

@@ -3,23 +3,25 @@ from __future__ import annotations
 import os
 from decimal import Decimal
 from pathlib import Path
-from typing import Self, cast
+from typing import Annotated, Self, cast
 
+import mm_crypto_utils
 import pydash
-from mm_std import BaseConfig, PrintFormat, fatal, hr
-from pydantic import Field, field_validator, model_validator
+from mm_crypto_utils import ConfigValidators
+from mm_std import BaseConfig, PrintFormat, fatal
+from pydantic import BeforeValidator, Field, StringConstraints, model_validator
 
 from mm_balance.constants import DEFAULT_NODES, TOKEN_ADDRESS, Network
 
 
 class Group(BaseConfig):
     comment: str = ""
-    ticker: str
+    ticker: Annotated[str, StringConstraints(to_upper=True)]
     network: Network
     token_address: str | None = None  # If None, it's a native token, for example ETH
     token_decimals: int | None = None
     coingecko_id: str | None = None
-    addresses: list[str] = Field(default_factory=list)
+    addresses: Annotated[list[str], BeforeValidator(ConfigValidators.addresses(unique=True))]
     share: Decimal = Decimal(1)
 
     @property
@@ -30,20 +32,6 @@ class Group(BaseConfig):
         result += " / " + self.network
         return result
 
-    @field_validator("ticker", mode="after")
-    def ticker_validator(cls, v: str) -> str:
-        return v.upper()
-
-    @field_validator("addresses", mode="before")
-    def to_list_validator(cls, v: str | list[str] | None) -> list[str]:
-        return cls.to_list_str_validator(v, unique=True, remove_comments=True, split_line=True)
-
-    # @model_validator(mode="before")
-    # def before_all(cls, data: Any) -> Any:
-    #     if "network" not in data:
-    #         data["network"] = detect_network(data["coin"])
-    #     return data
-
     @model_validator(mode="after")
     def final_validator(self) -> Self:
         if self.token_address is None:
@@ -65,11 +53,7 @@ class Group(BaseConfig):
 
 class AddressGroup(BaseConfig):
     name: str
-    addresses: list[str]
-
-    @field_validator("addresses", mode="before")
-    def to_list_validator(cls, v: str | list[str] | None) -> list[str]:
-        return cls.to_list_str_validator(v, unique=True, remove_comments=True, split_line=True)
+    addresses: Annotated[list[str], BeforeValidator(ConfigValidators.addresses(unique=True))]
 
 
 class Config(BaseConfig):
@@ -97,9 +81,9 @@ class Config(BaseConfig):
     def final_validator(self) -> Self:
         # load from proxies_url
         if self.proxies_url is not None:
-            self.proxies = get_proxies(self.proxies_url)
+            self.proxies += mm_crypto_utils.fetch_proxies_or_fatal(self.proxies_url)
         elif os.getenv("MM_BALANCE_PROXIES_URL"):
-            self.proxies = get_proxies(cast(str, os.getenv("MM_BALANCE_PROXIES_URL")))
+            self.proxies += mm_crypto_utils.fetch_proxies_or_fatal(cast(str, os.getenv("MM_BALANCE_PROXIES_URL")))
 
         # load addresses from address_group
         for group in self.groups:
@@ -123,17 +107,6 @@ def detect_token_address(ticker: str, network: Network) -> str | None:
         return TOKEN_ADDRESS[network].get(ticker)
 
 
-def get_proxies(proxies_url: str) -> list[str]:
-    try:
-        res = hr(proxies_url)
-        if res.is_error():
-            fatal(f"Can't get proxies: {res.error}")
-        proxies = [p.strip() for p in res.body.splitlines() if p.strip()]
-        return pydash.uniq(proxies)
-    except Exception as err:
-        fatal(f"Can't get  proxies: {err}")
-
-
 def get_address_group_by_name(address_groups: list[AddressGroup], name: str) -> AddressGroup | None:
     return pydash.find(address_groups, lambda g: g.name == name)
 

mm_balance/rpc/btc.py

@@ -10,7 +10,5 @@ def get_balance(address: str, proxies: list[str], round_ndigits: int) -> Result[
     return (
         BlockstreamClient(proxies=proxies, attempts=RETRIES_BALANCE)
         .get_confirmed_balance(address)
-        .and_then(
-            lambda b: Ok(round(Decimal(b / 100_000_000), round_ndigits)),
-        )
+        .and_then(lambda b: Ok(round(Decimal(b / 100_000_000), round_ndigits)))
     )

mm_balance/workers.py

@@ -1,8 +1,8 @@
 from dataclasses import dataclass
 from decimal import Decimal
-from typing import TYPE_CHECKING
 
 from mm_std import ConcurrentTasks, PrintFormat, Result
+from rich.progress import TaskID
 
 from mm_balance.config import Config
 from mm_balance.constants import NETWORK_APTOS, NETWORK_BITCOIN, NETWORK_SOLANA, Network
@@ -10,9 +10,6 @@ from mm_balance.output import utils
 from mm_balance.rpc import aptos, btc, evm, solana
 from mm_balance.token_decimals import TokenDecimals
 
-if TYPE_CHECKING:
-    from rich.progress import TaskID
-
 
 @dataclass
 class Task:

{mm_balance-0.1.19.dist-info → mm_balance-0.1.20.dist-info}/METADATA

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: mm-balance
-Version: 0.1.19
+Version: 0.1.20
 Requires-Python: >=3.12
 Requires-Dist: mm-aptos==0.1.5
 Requires-Dist: mm-btc==0.2.1
-Requires-Dist: mm-eth==0.2.3
-Requires-Dist: mm-solana==0.2.3
+Requires-Dist: mm-crypto-utils==0.0.13
+Requires-Dist: mm-eth==0.2.5
+Requires-Dist: mm-solana==0.2.4
 Requires-Dist: typer>=0.15.1

{mm_balance-0.1.19.dist-info → mm_balance-0.1.20.dist-info}/RECORD

@@ -1,12 +1,12 @@
 mm_balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_balance/cli.py,sha256=7yQ0DiSDVYeG9lFav-PJnVswncWIfpZsj1G7CZvMDmc,3119
-mm_balance/config.py,sha256=LsmfluUFpTfXMvXUUzGQtiZlz1gliiDrDx4c4SqgPws,5383
+mm_balance/config.py,sha256=7dB_8MrefufIi32-ubgiUxjacmeKERGNIbc1yXNw4ec,4578
 mm_balance/constants.py,sha256=kqG2zuwv0l-PzDHIrMJVQpfQWiXjr2DsqGPcKmqNJLo,2334
 mm_balance/price.py,sha256=9pK2Iy44zTcHIlrja5wC_jV03Q7bJr-S8joNzEsyUl0,1485
 mm_balance/result.py,sha256=rwCSnuyK-u4mz1QmQucFKLC2-vpkSoXfFxbu0MScp9g,4524
 mm_balance/token_decimals.py,sha256=5VZyx29euGtE2KIStQjh6xCcVg1qQweFAykUZU6vkRU,2268
 mm_balance/utils.py,sha256=bngYS2WFIakGZO31_ey4MPsllvDhgOxkAnGiXqom3J4,286
-mm_balance/workers.py,sha256=HujTVy_XxXbFLnZdLh1RjN0q9ziwaRRrQspffBSSLQU,3795
+mm_balance/workers.py,sha256=U9oQOkYtg83tbzCdhs-RqrqeX9JAY1H_AW65gLytxMU,3739
 mm_balance/config/example.yml,sha256=7n72tHsnUbZ64q856IeKHlmt-7PvtAgZlB8t4AS0NzI,1899
 mm_balance/output/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_balance/output/utils.py,sha256=WUFwshFMKZKdcwRtO21nhxqW78JeLAatDyHPZhdV96A,716
@@ -15,10 +15,10 @@ mm_balance/output/formats/json_format.py,sha256=yMkZTA6vOUpLSixF7H4H4lVZKShRs4B9
 mm_balance/output/formats/table_format.py,sha256=qN1uMF1cyAVOH31Gohoc_a4l9-pWTSZ8WRxBBSAwj54,4539
 mm_balance/rpc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_balance/rpc/aptos.py,sha256=1JCYCqDim4tk1axXscaAJRXPd4J6vV1ABFbwMbPgrL0,641
-mm_balance/rpc/btc.py,sha256=ugp90H7YW0kiXIh98bQWk9mQTW20yE-jBiCpRvfoH-U,481
+mm_balance/rpc/btc.py,sha256=iGDoO7HXP6reLI0bWm0UhEl7-UFZTo5xCWNzFngbITw,458
 mm_balance/rpc/evm.py,sha256=ewlMmRrcXKlky3DPNbnUBTVwnvyw7N9iCZLsCX2V14w,1007
 mm_balance/rpc/solana.py,sha256=Lwl5Otqy48g4LWfz9uN7_rkICKUIYJvf88PbIAnfMdc,1051
-mm_balance-0.1.19.dist-info/METADATA,sha256=V4gmUFJZqkwrVTWctBPk0Ocs8sZ4xRMw3dUhDKn_i6o,229
-mm_balance-0.1.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_balance-0.1.19.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
-mm_balance-0.1.19.dist-info/RECORD,,
+mm_balance-0.1.20.dist-info/METADATA,sha256=rUfrIh7wO8EWYVsDHysHw0yX202FfCpmGHK9qm_R_nA,268
+mm_balance-0.1.20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_balance-0.1.20.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
+mm_balance-0.1.20.dist-info/RECORD,,