mm-balance 0.5.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

mm_balance/cli.py

@@ -25,8 +25,8 @@ def example_callback(value: bool) -> None:
     if value:
         data = pkgutil.get_data(__name__, "config/example.toml")
         if data is None:
-            mm_print.fatal("Example config not found")
-        mm_print.toml(toml=data.decode("utf-8"))
+            mm_print.exit_with_error("Example config not found")
+        mm_print.toml(data.decode("utf-8"))
         raise typer.Exit
 
 

mm_balance/command_runner.py

@@ -63,7 +63,7 @@ async def run(params: CommandParameters) -> None:
     elif config.settings.print_format is PrintFormat.JSON:
         json_format.print_result(config, token_decimals, prices, workers, result)
     else:
-        mm_print.fatal("Unsupported print format")
+        mm_print.exit_with_error("Unsupported print format")
 
     if params.save_balances:
         BalancesDict.from_balances_result(result).save_to_path(params.save_balances)

mm_balance/config/example.toml

@@ -17,7 +17,7 @@ addresses = """
 bc1qgdjqv0av3q56jvd82tkdjpy7gdp9ut8tlqmgrpmv24sq90ecnvqqjwvw97 # bitfinex
 bc1ql49ydapnjafl5t2cp9zqpjwe6pdgmxy98859v2 # robinhood
 """
-share = 0.1
+share = "0.5(total - 100.5)"  # or: "total - 1000", "0.3total + 50", etc.
 
 [[coins]]
 ticker = "ETH"

mm_balance/config.py

@@ -6,18 +6,18 @@ from typing import Annotated, Self
 
 import mm_print
 import pydash
-from mm_cryptocurrency import ConfigValidators, CryptocurrencyConfig
+from mm_web3 import ConfigValidators, Web3CliConfig
 from pydantic import BeforeValidator, Field, StringConstraints, model_validator
 
 from mm_balance.constants import DEFAULT_NODES, TOKEN_ADDRESS, Network
-from mm_balance.utils import PrintFormat
+from mm_balance.utils import PrintFormat, evaluate_share_expression
 
 
 class Validators(ConfigValidators):
     pass
 
 
-class AssetGroup(CryptocurrencyConfig):
+class AssetGroup(Web3CliConfig):
     """
     Represents a group of cryptocurrency assets of the same type.
 
@@ -32,7 +32,7 @@ class AssetGroup(CryptocurrencyConfig):
     decimals: int | None = None
     coingecko_id: str | None = None
     addresses: Annotated[list[str], BeforeValidator(Validators.addresses(deduplicate=True))]
-    share: Decimal = Decimal(1)
+    share: str = "total"
 
     @property
     def name(self) -> str:
@@ -42,6 +42,10 @@ class AssetGroup(CryptocurrencyConfig):
         result += " / " + self.network
         return result
 
+    def evaluate_share(self, balance_sum: Decimal) -> Decimal:
+        """Evaluate share expression with actual balance_sum value."""
+        return evaluate_share_expression(self.share, balance_sum)
+
     @model_validator(mode="after")
     def final_validator(self) -> Self:
         if self.token is None:
@@ -58,7 +62,7 @@ class AssetGroup(CryptocurrencyConfig):
                 if path.is_file():
                     result += path.read_text().strip().splitlines()
                 else:
-                    mm_print.fatal(f"File with addresses not found: {path}")
+                    mm_print.exit_with_error(f"File with addresses not found: {path}")
             elif line.startswith("group:"):
                 group_name = line.removeprefix("group:").strip()
                 address_group = next((ag for ag in address_groups if ag.name == group_name), None)
@@ -73,12 +77,12 @@ class AssetGroup(CryptocurrencyConfig):
         self.addresses = pydash.uniq(result)
 
 
-class AddressCollection(CryptocurrencyConfig):
+class AddressCollection(Web3CliConfig):
     name: str
     addresses: Annotated[list[str], BeforeValidator(Validators.addresses(deduplicate=True))]
 
 
-class Settings(CryptocurrencyConfig):
+class Settings(Web3CliConfig):
     proxies: Annotated[list[str], Field(default_factory=list), BeforeValidator(Validators.proxies())]
     round_ndigits: int = 4
     print_format: PrintFormat = PrintFormat.TABLE
@@ -88,7 +92,7 @@ class Settings(CryptocurrencyConfig):
     format_number_separator: str = ","  # as thousands separators
 
 
-class Config(CryptocurrencyConfig):
+class Config(Web3CliConfig):
     groups: list[AssetGroup] = Field(alias="coins")
     addresses: list[AddressCollection] = Field(default_factory=list)
     nodes: dict[Network, list[str]] = Field(default_factory=dict)
@@ -96,7 +100,7 @@ class Config(CryptocurrencyConfig):
     settings: Settings = Field(default_factory=Settings)  # type: ignore[arg-type]
 
     def has_share(self) -> bool:
-        return any(g.share != Decimal(1) for g in self.groups)
+        return any(g.share != "total" for g in self.groups)
 
     def networks(self) -> list[Network]:
         return pydash.uniq([group.network for group in self.groups])

mm_balance/diff.py

@@ -97,7 +97,7 @@ class Diff(BaseModel):
                     for address in self.balance_changed[network][ticker]:
                         old_value, new_value = self.balance_changed[network][ticker][address]
                         rows.append([network, ticker, address, old_value, new_value, new_value - old_value])
-            mm_print.table("", ["Network", "Ticker", "Address", "Old", "New", "Change"], rows)
+            mm_print.table(["Network", "Ticker", "Address", "Old", "New", "Change"], rows)
 
     def _print_json(self) -> None:
         # mm_print.json(data=self.model_dump(), type_handlers=str) ?? default?

mm_balance/output/formats/table_format.py

@@ -14,18 +14,18 @@ def print_nodes(config: Config) -> None:
     rows = []
     for network, nodes in config.nodes.items():
         rows.append([network, "\n".join(nodes)])
-    mm_print.table("Nodes", ["network", "nodes"], rows)
+    mm_print.table(["network", "nodes"], rows, title="Nodes")
 
 
 def print_proxy_count(config: Config) -> None:
-    mm_print.table("Proxies", ["count"], [[len(config.settings.proxies)]])
+    mm_print.table(["count"], [[len(config.settings.proxies)]], title="Proxies")
 
 
 def print_token_decimals(token_decimals: TokenDecimals) -> None:
     rows = []
     for network, decimals in token_decimals.items():
         rows.append([network, decimals])
-    mm_print.table("Token Decimals", ["network", "decimals"], rows)
+    mm_print.table(["network", "decimals"], rows, title="Token Decimals")
 
 
 def print_prices(config: Config, prices: Prices) -> None:
@@ -35,7 +35,7 @@ def print_prices(config: Config, prices: Prices) -> None:
             rows.append(
                 [ticker, format_number(price, config.settings.format_number_separator, "$", config.settings.round_ndigits)]
             )
-        mm_print.table("Prices", ["coin", "usd"], rows)
+        mm_print.table(["coin", "usd"], rows, title="Prices")
 
 
 def print_result(config: Config, result: BalancesResult, workers: BalanceFetcher) -> None:
@@ -57,7 +57,7 @@ def _print_errors(config: Config, workers: BalanceFetcher) -> None:
     for task in error_tasks:
         group = config.groups[task.group_index]
         rows.append([group.ticker + " / " + group.network, task.wallet_address, task.balance.error])  # type: ignore[union-attr]
-    mm_print.table("Errors", ["coin", "address", "error"], rows)
+    mm_print.table(["coin", "address", "error"], rows, title="Errors")
 
 
 def _print_total(config: Config, total: Total, is_share_total: bool) -> None:
@@ -80,7 +80,7 @@ def _print_total(config: Config, total: Total, is_share_total: bool) -> None:
             rows.append(["stablecoin_sum", format_number(total.stablecoin_sum, config.settings.format_number_separator, "$")])
         rows.append(["total_usd_sum", format_number(total.total_usd_sum, config.settings.format_number_separator, "$")])
 
-    mm_print.table(table_name, headers, rows)
+    mm_print.table(headers, rows, title=table_name)
 
 
 def _print_group(config: Config, group: GroupResult) -> None:
@@ -108,7 +108,7 @@ def _print_group(config: Config, group: GroupResult) -> None:
         sum_row.append(format_number(group.usd_sum, config.settings.format_number_separator, "$"))
     rows.append(sum_row)
 
-    if group.share < Decimal(1):
+    if group.share != "total":
         sum_share_str = format_number(group.balance_sum_share, config.settings.format_number_separator)
         sum_share_row = [f"sum_share, {group.share}", sum_share_str]
         if config.settings.price:
@@ -118,4 +118,4 @@ def _print_group(config: Config, group: GroupResult) -> None:
     table_headers = ["address", "balance"]
     if config.settings.price:
         table_headers += ["usd"]
-    mm_print.table(group_name, table_headers, rows)
+    mm_print.table(table_headers, rows, title=group_name)

mm_balance/price.py

@@ -2,8 +2,8 @@ from collections import defaultdict
 from decimal import Decimal
 
 import pydash
-from mm_cryptocurrency import random_proxy
 from mm_http import http_request
+from mm_web3 import random_proxy
 
 from mm_balance.config import AssetGroup, Config
 from mm_balance.constants import RETRIES_COINGECKO_PRICES, TICKER_TO_COINGECKO_ID
@@ -34,7 +34,7 @@ async def get_prices(config: Config) -> Prices:
         if res.status_code != 200:
             continue
 
-        json_body = res.parse_json_body() or {}
+        json_body = res.parse_json()
 
         for ticker, coingecko_id in coingecko_map.items():
             if coingecko_id in json_body:

mm_balance/result.py

@@ -26,12 +26,12 @@ class GroupResult:
     ticker: str
     network: Network
     comment: str
-    share: Decimal
+    share: str
     addresses: list[AddressBalance]
     balance_sum: Decimal  # sum of all balances in the group
     usd_sum: Decimal  # sum of all usd values in the group
-    balance_sum_share: Decimal  # sum of all balances in the group multiplied by share
-    usd_sum_share: Decimal  # sum of all usd values in the group multiplied by share
+    balance_sum_share: Decimal  # calculated from share expression
+    usd_sum_share: Decimal  # proportional to balance_sum_share
 
 
 @dataclass
@@ -113,8 +113,8 @@ def _create_group_result(config: Config, group: AssetGroup, tasks: list[Task], p
             balance = task.balance.unwrap_err()
         addresses.append(AddressBalance(address=task.wallet_address, balance=balance))
 
-    balance_sum_share = balance_sum * group.share
-    usd_sum_share = usd_sum * group.share
+    balance_sum_share = group.evaluate_share(balance_sum)
+    usd_sum_share = usd_sum * (balance_sum_share / balance_sum) if balance_sum > 0 else Decimal(0)
 
     return GroupResult(
         ticker=group.ticker,

mm_balance/rpc.py

@@ -2,10 +2,10 @@ from decimal import Decimal
 
 from mm_apt import retry as apt_retry
 from mm_btc.blockstream import BlockstreamClient
-from mm_cryptocurrency import Nodes, Proxies
 from mm_eth import retry as eth_retry
 from mm_result import Result
 from mm_sol import retry as sol_retry
+from mm_web3 import Nodes, Proxies
 
 from mm_balance.constants import (
     NETWORK_APTOS,

mm_balance/token_decimals.py

@@ -30,7 +30,7 @@ async def get_token_decimals(config: Config) -> TokenDecimals:
             elif group.network in (NETWORK_BITCOIN, NETWORK_APTOS):
                 result[group.network][None] = 8
             else:
-                mm_print.fatal(f"Can't get token decimals for native token on network: {group.network}")
+                mm_print.exit_with_error(f"Can't get token decimals for native token on network: {group.network}")
             continue
 
         # get token_decimals via RPC
@@ -46,7 +46,7 @@ async def get_token_decimals(config: Config) -> TokenDecimals:
             msg = f"can't get decimals for token {group.ticker} / {group.token}, error={res.unwrap_err()}"
             if config.settings.print_debug:
                 msg += f"\n{res.extra}"
-            mm_print.fatal(msg)
+            mm_print.exit_with_error(msg)
 
         result[group.network][group.token] = res.unwrap()
 

mm_balance/utils.py

@@ -1,3 +1,4 @@
+import re
 from decimal import Decimal
 from enum import StrEnum, unique
 
@@ -23,6 +24,138 @@ def round_decimal(value: Decimal, round_ndigits: int) -> Decimal:
     return round(value, round_ndigits)
 
 
+class _ExpressionParser:
+    """Recursive descent parser for arithmetic expressions.
+
+    Parses expressions by reading left-to-right, respecting operator precedence:
+    1. Parentheses and unary +/- (highest)
+    2. Multiplication and division
+    3. Addition and subtraction (lowest)
+
+    Uses self.pos as a cursor tracking current position in the string.
+    """
+
+    def __init__(self, expr: str) -> None:
+        self.expr = expr.replace(" ", "")  # Expression string with spaces removed
+        self.pos = 0  # Current position/index in the string (starts at beginning)
+
+    def parse(self) -> Decimal:
+        result = self._parse_expression()
+        if self.pos < len(self.expr):
+            raise ValueError(f"Unexpected character at position {self.pos}: '{self.expr[self.pos]}'")
+        return result
+
+    def _parse_expression(self) -> Decimal:
+        """Parse addition and subtraction (lowest precedence)."""
+        result = self._parse_term()
+
+        while self.pos < len(self.expr):
+            if self._peek() == "+":
+                self.pos += 1
+                result = result + self._parse_term()
+            elif self._peek() == "-":
+                self.pos += 1
+                result = result - self._parse_term()
+            else:
+                break
+
+        return result
+
+    def _parse_term(self) -> Decimal:
+        """Parse multiplication and division (medium precedence)."""
+        result = self._parse_factor()
+
+        while self.pos < len(self.expr):
+            if self._peek() == "*":
+                self.pos += 1
+                result = result * self._parse_factor()
+            elif self._peek() == "/":
+                self.pos += 1
+                divisor = self._parse_factor()
+                if divisor == 0:
+                    raise ValueError("Division by zero")
+                result = result / divisor
+            else:
+                break
+
+        return result
+
+    def _parse_factor(self) -> Decimal:
+        """Parse unary +/-, numbers, and parentheses (highest precedence)."""
+        if self._peek() == "+":
+            self.pos += 1
+            return self._parse_factor()
+        if self._peek() == "-":
+            self.pos += 1
+            return -self._parse_factor()
+
+        if self._peek() == "(":
+            self.pos += 1
+            result = self._parse_expression()
+            if self._peek() != ")":
+                raise ValueError(f"Expected ')' at position {self.pos}")
+            self.pos += 1
+            return result
+
+        return self._parse_number()
+
+    def _parse_number(self) -> Decimal:
+        """Parse a numeric value.
+
+        Scans digits, optionally followed by a decimal point and more digits.
+        Advances self.pos past the entire number.
+        """
+        start = self.pos
+
+        # Scan integer part: consecutive digits
+        while self.pos < len(self.expr) and self.expr[self.pos].isdigit():
+            self.pos += 1
+
+        # If there's a decimal point, scan fractional part
+        if self.pos < len(self.expr) and self.expr[self.pos] == ".":
+            self.pos += 1
+            while self.pos < len(self.expr) and self.expr[self.pos].isdigit():
+                self.pos += 1
+
+        # Ensure we consumed at least one digit
+        if start == self.pos:
+            raise ValueError(f"Expected number at position {self.pos}")
+
+        # Extract the substring from start to current position
+        return Decimal(self.expr[start : self.pos])
+
+    def _peek(self) -> str | None:
+        """Peek at the current character without consuming it."""
+        if self.pos < len(self.expr):
+            return self.expr[self.pos]
+        return None
+
+
+def evaluate_share_expression(expression: str, balance_sum: Decimal) -> Decimal:
+    """Evaluate share expression with actual balance_sum value.
+
+    Supports expressions like:
+    - "total" -> full balance
+    - "0.5total" -> 50% of balance
+    - "0.5(total - 100)" -> 50% of (balance - 100)
+    - "total - 1000" -> balance minus 1000
+    """
+    if not re.match(r"^[0-9+\-*/.() total]+$", expression):
+        raise ValueError(f"Invalid share expression '{expression}': contains invalid characters")
+
+    # Insert * before ( when preceded by digit or )
+    expr = re.sub(r"(\d|\))\(", r"\1*(", expression)
+    # Insert * before 'total' when preceded by digit or )
+    expr = re.sub(r"(\d|\))total", r"\1*total", expr)
+    # Replace 'total' with actual value in parentheses
+    expr = expr.replace("total", f"({balance_sum})")
+    try:
+        parser = _ExpressionParser(expr)
+        return parser.parse()
+    except Exception as e:
+        raise ValueError(f"Invalid share expression '{expression}': {e}") from e
+
+
 @unique
 class PrintFormat(StrEnum):
     PLAIN = "plain"

mm_balance-0.6.0.dist-info/METADATA

@@ -0,0 +1,10 @@
+Metadata-Version: 2.4
+Name: mm-balance
+Version: 0.6.0
+Requires-Python: >=3.13
+Requires-Dist: deepdiff==8.6.1
+Requires-Dist: mm-apt==0.5.0
+Requires-Dist: mm-btc==0.5.5
+Requires-Dist: mm-concurrency~=0.1.0
+Requires-Dist: mm-eth==0.7.3
+Requires-Dist: mm-sol==0.7.3

mm_balance-0.6.0.dist-info/RECORD

@@ -0,0 +1,22 @@
+mm_balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_balance/balance_fetcher.py,sha256=OCRQz_8lYxBKIicwXR3ysQOYxbLfYKRfaLWiFLnR0c8,3239
+mm_balance/cli.py,sha256=t_pshfbHEtzkmV9U6HrTAQy9HBVUqdf4jStUJ_s5Omg,2714
+mm_balance/command_runner.py,sha256=JvFHDzG6cEOic648PGlsNa3PwnA_rHRPB940WGPmWZo,2885
+mm_balance/config.py,sha256=eeE44dXnhekN4c4ZYcIpwQZiYr54Lku97RYasoE2IkY,5153
+mm_balance/constants.py,sha256=LhyW1EfNP5E8st-RPvD7p3QoIowFH2W14tkCf6NzveU,2468
+mm_balance/diff.py,sha256=CLaqXvFFZjxv9zJUE0O-rWyvSZNDi-jM1Md0LfgNOf8,7168
+mm_balance/price.py,sha256=jOwjD-7pIdo894iNH4pK-7LPuz6KnHDR23ghfmOedvU,1567
+mm_balance/result.py,sha256=qW2MRNiPt1JlFUSOJCFCcp-dEirZ2RK3RG5wyE1JAGQ,5193
+mm_balance/rpc.py,sha256=Z-rHJdhD8ScghUchV2M6rb8jyiPfB3nChEWFXjcBQOo,6116
+mm_balance/token_decimals.py,sha256=g8z2ahdVY5nlgmHyvlK9Dk9ush6G7eBkp31k74e9rKE,2087
+mm_balance/utils.py,sha256=GElNtCgE5jb2idak8l6_TnL7JhvmK9mdwObjVwdgE9o,5459
+mm_balance/config/example.toml,sha256=tqYx9gxhXYa5uKWFi-MDHYkPOgxqgrO_ZuU7T5tLzLM,1864
+mm_balance/output/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_balance/output/utils.py,sha256=zyN9igdaXGY_vKfc-3dJ13mH1T7JDke3AeB4MY_3AsA,842
+mm_balance/output/formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_balance/output/formats/json_format.py,sha256=uNs2P1J6QhxCsHo8TOqG6aQbDfBkVjIwYyo96d2K17Q,910
+mm_balance/output/formats/table_format.py,sha256=2Y-21O7q-ghTrVSVewRPlhM-M86MoKw_arIYP5wALWE,4828
+mm_balance-0.6.0.dist-info/METADATA,sha256=3F0EMDxp6X84Wf1sb4cBnIUJ0QfnAk0K7Orsa6VtLUA,262
+mm_balance-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_balance-0.6.0.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
+mm_balance-0.6.0.dist-info/RECORD,,

mm_balance-0.5.0.dist-info/METADATA

@@ -1,10 +0,0 @@
-Metadata-Version: 2.4
-Name: mm-balance
-Version: 0.5.0
-Requires-Python: >=3.13
-Requires-Dist: deepdiff==8.5.0
-Requires-Dist: mm-apt==0.4.1
-Requires-Dist: mm-btc==0.5.2
-Requires-Dist: mm-concurrency>=0.0.1
-Requires-Dist: mm-eth==0.7.0
-Requires-Dist: mm-sol==0.7.0

mm_balance-0.5.0.dist-info/RECORD

@@ -1,22 +0,0 @@
-mm_balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/balance_fetcher.py,sha256=OCRQz_8lYxBKIicwXR3ysQOYxbLfYKRfaLWiFLnR0c8,3239
-mm_balance/cli.py,sha256=6qif4QExl4vZDYrasc2MAizmwe1xtvsncbxEdJkqK-M,2709
-mm_balance/command_runner.py,sha256=chA43ZrWBrSKnL7VBuc_gIFs3zgmWm2XK66Vqz_3QKs,2875
-mm_balance/config.py,sha256=r_tFtgRv17SJXoCKpiTLCk3ukcONG-TDFdo88vjdE9E,4970
-mm_balance/constants.py,sha256=LhyW1EfNP5E8st-RPvD7p3QoIowFH2W14tkCf6NzveU,2468
-mm_balance/diff.py,sha256=1NLzfzgOR34FTUFulWjOhUxNsMjt3W5u_7106FLBuaY,7172
-mm_balance/price.py,sha256=s8B9TgbwAyB5x1bgOTbcftivCvCr40UmFmoOaXjBKyQ,1588
-mm_balance/result.py,sha256=vBz_V-ZCkEhrf-Utc7VB_3eP0cuL9pAmEkVJbOpdKIc,5173
-mm_balance/rpc.py,sha256=nNJoXIBen4xe0WS6nFYvL_7VyRzNe7we__swj6xN-bo,6126
-mm_balance/token_decimals.py,sha256=leLKHJDmQzt8gnLvkARN96pYoEnus20_WNBPKDXDpKw,2067
-mm_balance/utils.py,sha256=9vsm84f5MUp0s3Auy3JAHJ7saSWlLIlXkwoxqsuZrPU,765
-mm_balance/config/example.toml,sha256=f3Jr40ziOCv_Txf-BysS89c9r7uS-IYHuvwbQ-iftUs,1802
-mm_balance/output/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/output/utils.py,sha256=zyN9igdaXGY_vKfc-3dJ13mH1T7JDke3AeB4MY_3AsA,842
-mm_balance/output/formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/output/formats/json_format.py,sha256=uNs2P1J6QhxCsHo8TOqG6aQbDfBkVjIwYyo96d2K17Q,910
-mm_balance/output/formats/table_format.py,sha256=sXVoKqDoVQXzt_iNyxfcQwG5lH-l8Ko5bm4_OZGKUfg,4788
-mm_balance-0.5.0.dist-info/METADATA,sha256=Pjj-dEDVcj_fe1vklSG_ALmxFv44ngOpGpoJjF0ZWxY,262
-mm_balance-0.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_balance-0.5.0.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
-mm_balance-0.5.0.dist-info/RECORD,,