mm-balance 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

mm_balance/cli.py

@@ -5,7 +5,7 @@ import pkgutil
 from typing import Annotated
 
 import typer
-from mm_std import PrintFormat, fatal
+from mm_std import PrintFormat, fatal, pretty_print_toml
 
 from mm_balance.config import Config
 from mm_balance.constants import NETWORKS
@@ -27,7 +27,9 @@ def version_callback(value: bool) -> None:
 def example_callback(value: bool) -> None:
     if value:
         data = pkgutil.get_data(__name__, "config/example.toml")
-        typer.echo(data)
+        if data is None:
+            fatal("Example config not found")
+        pretty_print_toml(data.decode("utf-8"))
         raise typer.Exit
 
 

mm_balance/config/example.toml

@@ -47,8 +47,8 @@ addresses = "group: binance_eth"
 ticker = "USDC"
 network = "aptos"
 comment = "swap.thala.apt"
-token_address = "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDC"
-token_decimals = 6
+token = "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDC"
+decimals = 6
 addresses = "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af"
 
 

mm_balance/config.py

@@ -20,8 +20,8 @@ class Group(BaseConfig):
     comment: 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
+    token: str | None = None  # Token address. If None, it's a native token, for example ETH
+    decimals: int | None = None
     coingecko_id: str | None = None
     addresses: Annotated[list[str], BeforeValidator(Validators.addresses(unique=True))]
     share: Decimal = Decimal(1)
@@ -36,10 +36,10 @@ class Group(BaseConfig):
 
     @model_validator(mode="after")
     def final_validator(self) -> Self:
-        if self.token_address is None:
-            self.token_address = detect_token_address(self.ticker, self.network)
-        if self.token_address is not None and self.network.is_evm_network():
-            self.token_address = self.token_address.lower()
+        if self.token is None:
+            self.token = detect_token_address(self.ticker, self.network)
+        if self.token is not None and self.network.is_evm_network():
+            self.token = self.token.lower()
         return self
 
     def process_addresses(self, address_groups: list[AddressGroup]) -> None:

mm_balance/output/formats/table_format.py

@@ -33,7 +33,7 @@ def print_prices(config: Config, prices: Prices) -> None:
         rows = []
         for ticker, price in prices.items():
             rows.append(
-                [ticker, format_number(round(price, config.settings.round_ndigits), config.settings.format_number_separator, "$")]
+                [ticker, format_number(price, config.settings.format_number_separator, "$", config.settings.round_ndigits)]
             )
         print_table("Prices", ["coin", "usd"], rows)
 

mm_balance/output/utils.py

@@ -3,7 +3,9 @@ from decimal import Decimal
 from rich.progress import BarColumn, MofNCompleteColumn, Progress, TaskID, TextColumn
 
 
-def format_number(value: Decimal, separator: str, extra: str | None = None) -> str:
+def format_number(value: Decimal, separator: str, extra: str | None = None, round_ndigits: int | None = None) -> str:
+    if round_ndigits is not None and value > 0:
+        value = round(value, round_ndigits)
     str_value = f"{value:,}".replace(",", separator)
     if extra == "$":
         return "$" + str_value

mm_balance/result.py

@@ -7,6 +7,7 @@ from mm_std import Ok
 from mm_balance.config import Config, Group
 from mm_balance.constants import USD_STABLECOINS, Network
 from mm_balance.price import Prices
+from mm_balance.utils import round_decimal
 from mm_balance.workers import Task, Workers
 
 
@@ -106,7 +107,7 @@ def _create_group_result(config: Config, group: Group, tasks: list[Task], prices
             coin_value = task.balance.ok
             usd_value = Decimal(0)
             if group.ticker in prices:
-                usd_value = round(coin_value * prices[group.ticker], config.settings.round_ndigits)
+                usd_value = round_decimal(coin_value * prices[group.ticker], config.settings.round_ndigits)
             balance = Balance(balance=coin_value, usd_value=usd_value)
             balance_sum += balance.balance
             usd_sum += balance.usd_value

mm_balance/rpc/btc.py

@@ -4,11 +4,12 @@ from mm_btc.blockstream import BlockstreamClient
 from mm_std import Ok, Result
 
 from mm_balance.constants import RETRIES_BALANCE
+from mm_balance.utils import scale_and_round
 
 
 def get_balance(address: str, proxies: list[str], round_ndigits: int) -> Result[Decimal]:
     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(scale_and_round(b, 8, round_ndigits)))
     )

mm_balance/rpc/evm.py

@@ -4,6 +4,7 @@ from mm_eth import erc20, rpc
 from mm_std import Ok, Result
 
 from mm_balance.constants import RETRIES_BALANCE, RETRIES_DECIMALS, TIMEOUT_BALANCE, TIMEOUT_DECIMALS
+from mm_balance.utils import scale_and_round
 
 
 def get_balance(
@@ -20,7 +21,7 @@ def get_balance(
         )
     else:
         res = rpc.eth_get_balance(nodes, wallet, proxies=proxies, attempts=RETRIES_BALANCE, timeout=TIMEOUT_BALANCE)
-    return res.and_then(lambda b: Ok(round(Decimal(b / 10**decimals), round_ndigits)))
+    return res.and_then(lambda b: Ok(scale_and_round(b, decimals, round_ndigits)))
 
 
 def get_token_decimals(nodes: list[str], token_address: str, proxies: list[str]) -> Result[int]:

mm_balance/rpc/solana.py

@@ -4,6 +4,7 @@ from mm_sol import balance, token
 from mm_std import Ok, Result
 
 from mm_balance.constants import RETRIES_BALANCE, RETRIES_DECIMALS, TIMEOUT_BALANCE, TIMEOUT_DECIMALS
+from mm_balance.utils import scale_and_round
 
 
 def get_balance(
@@ -17,8 +18,7 @@ def get_balance(
         res = balance.get_token_balance_with_retries(
             nodes, wallet, token, retries=RETRIES_BALANCE, timeout=TIMEOUT_BALANCE, proxies=proxies
         )
-
-    return res.and_then(lambda b: Ok(round(Decimal(b / 10**decimals), round_ndigits)))
+    return res.and_then(lambda b: Ok(scale_and_round(b, decimals, round_ndigits)))
 
 
 def get_token_decimals(nodes: list[str], token_address: str, proxies: list[str]) -> Result[int]:

mm_balance/token_decimals.py

@@ -18,12 +18,12 @@ def get_token_decimals(config: Config) -> TokenDecimals:
 
     for group in config.groups:
         # token_decimals is already known
-        if group.token_decimals is not None:
-            result[group.network][group.token_address] = group.token_decimals
+        if group.decimals is not None:
+            result[group.network][group.token] = group.decimals
             continue
 
         # get token_decimals for known native tokens
-        if group.token_address is None:
+        if group.token is None:
             if group.network.is_evm_network():
                 result[group.network][None] = 18
             elif group.network == NETWORK_SOLANA:
@@ -36,18 +36,18 @@ def get_token_decimals(config: Config) -> TokenDecimals:
 
         # get token_decimals via RPC
         # TODO: group.token_address must be in normalized form, otherwise it can be different for the same token
-        if group.token_address in result[group.network]:
+        if group.token in result[group.network]:
             continue  # don't request for a token_decimals twice
 
         nodes = config.nodes[group.network]
         if group.network.is_evm_network():
-            res = evm.get_token_decimals(nodes, group.token_address, proxies)
+            res = evm.get_token_decimals(nodes, group.token, proxies)
         elif group.network == NETWORK_SOLANA:
-            res = solana.get_token_decimals(nodes, group.token_address, proxies)
+            res = solana.get_token_decimals(nodes, group.token, proxies)
         else:
-            fatal(f"unsupported network: {group.network}. Cant get token decimals for {group.token_address}")
+            fatal(f"unsupported network: {group.network}. Cant get token decimals for {group.token}")
         if isinstance(res, Err):
-            fatal(f"can't get decimals for token {group.ticker} / {group.token_address}, error={res.err}")
-        result[group.network][group.token_address] = res.ok
+            fatal(f"can't get decimals for token {group.ticker} / {group.token}, error={res.err}")
+        result[group.network][group.token] = res.ok
 
     return result

mm_balance/utils.py

@@ -8,3 +8,15 @@ def fnumber(value: Decimal, separator: str, extra: str | None = None) -> str:
     if extra == "%":
         return str_value + "%"
     return str_value
+
+
+def scale_and_round(value: int, decimals: int, round_ndigits: int) -> Decimal:
+    if value == 0:
+        return Decimal(0)
+    return round(Decimal(value / 10**decimals), round_ndigits)
+
+
+def round_decimal(value: Decimal, round_ndigits: int) -> Decimal:
+    if value == Decimal(0):
+        return Decimal(0)
+    return round(value, round_ndigits)

mm_balance/workers.py

@@ -28,7 +28,7 @@ class Workers:
         self.progress_bar_task: dict[Network, TaskID] = {}
 
         for idx, group in enumerate(config.groups):
-            task_list = [Task(group_index=idx, wallet_address=a, token_address=group.token_address) for a in group.addresses]
+            task_list = [Task(group_index=idx, wallet_address=a, token_address=group.token) for a in group.addresses]
             self.tasks[group.network].extend(task_list)
 
         for network in config.networks():

{mm_balance-0.2.2.dist-info → mm_balance-0.2.4.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: mm-balance
-Version: 0.2.2
+Version: 0.2.4
 Requires-Python: >=3.12
 Requires-Dist: mm-aptos==0.2.0
 Requires-Dist: mm-btc==0.3.0
-Requires-Dist: mm-eth==0.3.1
-Requires-Dist: mm-sol==0.3.1
+Requires-Dist: mm-eth==0.5.3
+Requires-Dist: mm-sol==0.5.1
 Requires-Dist: typer>=0.15.1

mm_balance-0.2.4.dist-info/RECORD

@@ -0,0 +1,24 @@
+mm_balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_balance/cli.py,sha256=AHaD6w97H8ru8nnQv2dcqh9v-d9BVirnlsClbLyHf6M,3796
+mm_balance/config.py,sha256=gywHNWEQL1xeG778cuca5aBoXElLIfoGle3xxW6m_0U,4564
+mm_balance/constants.py,sha256=kqG2zuwv0l-PzDHIrMJVQpfQWiXjr2DsqGPcKmqNJLo,2334
+mm_balance/price.py,sha256=DzvcQngS6wgi_4YWoXxGvOuOkwJvUbN0KI8DeIxbB5A,1494
+mm_balance/result.py,sha256=2bgK4PqS_uFGkYMj6LBiMRh6jRtzsKIkB5csZo0mAEQ,4584
+mm_balance/token_decimals.py,sha256=N3YppB2F3J_OuNkawpAHLVD-4MRCoVjBI01_OoRg5sY,2201
+mm_balance/utils.py,sha256=_UMX3TV350Sr222tAnxGUf0R5McpwloNTQC-U-xiuHc,636
+mm_balance/workers.py,sha256=eg0Ve1xVu3Kd_thfVmPsp6tEdJsYYvs1ipXiu5rKItY,3758
+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=japDhWBVaZ9Znwrhi6BLsUEyn2zyNVxPFYhH7SiILb8,893
+mm_balance/output/formats/table_format.py,sha256=QtWq6ETIccfBTw-9SPypeZrX2zfZwpoCFi_Qe_qOLAA,4751
+mm_balance/rpc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_balance/rpc/aptos.py,sha256=1JCYCqDim4tk1axXscaAJRXPd4J6vV1ABFbwMbPgrL0,641
+mm_balance/rpc/btc.py,sha256=wBMxUjbqdQipVsTFVkj4tk7loErA2czLVfvG8vjFLeE,493
+mm_balance/rpc/evm.py,sha256=LaU2csGL-VlQauCiTX_WFnstvTyZLMP5gDw2LyV53m8,1048
+mm_balance/rpc/solana.py,sha256=10rJ4eEr9sfEfhXx-X2R7bdJ5dL7bVMwHHfJ4R3QR7U,1071
+mm_balance-0.2.4.dist-info/METADATA,sha256=Qw5u6BzDKrcp7ZvP55NIWQx_PjpNVWuZt4wCsenugaM,225
+mm_balance-0.2.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_balance-0.2.4.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
+mm_balance-0.2.4.dist-info/RECORD,,

mm_balance-0.2.2.dist-info/RECORD

@@ -1,24 +0,0 @@
-mm_balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/cli.py,sha256=KYEfz1ztFpXAxOWlQMJ0rWGnAdkGkvTgVS53pm6YxCw,3683
-mm_balance/config.py,sha256=3qEg9xGCoH6WX91dlmjXVVhkCjJf8KFOmfqE8NgSc64,4603
-mm_balance/constants.py,sha256=kqG2zuwv0l-PzDHIrMJVQpfQWiXjr2DsqGPcKmqNJLo,2334
-mm_balance/price.py,sha256=DzvcQngS6wgi_4YWoXxGvOuOkwJvUbN0KI8DeIxbB5A,1494
-mm_balance/result.py,sha256=WsVLbf54cCJ76rIM2zHaOCQXMfZZMczdg8rlC2tDGWY,4533
-mm_balance/token_decimals.py,sha256=7XL_x_1ZIhp_cr1TvXwnqLqINUWFGo0j5_5lWuxmwpE,2277
-mm_balance/utils.py,sha256=bngYS2WFIakGZO31_ey4MPsllvDhgOxkAnGiXqom3J4,286
-mm_balance/workers.py,sha256=vEmmUI-ioMOv1C_Jcz0rnzI3vn7BaVWFnyXddteJkoA,3766
-mm_balance/config/example.toml,sha256=15Bjk_zkbhx9CqFgx1kbb2cRSBY9-kPKrej7N_8ulTk,1816
-mm_balance/output/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/output/utils.py,sha256=WUFwshFMKZKdcwRtO21nhxqW78JeLAatDyHPZhdV96A,716
-mm_balance/output/formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/output/formats/json_format.py,sha256=japDhWBVaZ9Znwrhi6BLsUEyn2zyNVxPFYhH7SiILb8,893
-mm_balance/output/formats/table_format.py,sha256=o_3MGOb0Ug9sqfaR61JDucSEtmFF22KlJoqpFWRuFu8,4758
-mm_balance/rpc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/rpc/aptos.py,sha256=1JCYCqDim4tk1axXscaAJRXPd4J6vV1ABFbwMbPgrL0,641
-mm_balance/rpc/btc.py,sha256=iGDoO7HXP6reLI0bWm0UhEl7-UFZTo5xCWNzFngbITw,458
-mm_balance/rpc/evm.py,sha256=ewlMmRrcXKlky3DPNbnUBTVwnvyw7N9iCZLsCX2V14w,1007
-mm_balance/rpc/solana.py,sha256=c756415rlhQkHsVsqxHcA7wIaSM64IqyxMohjz8IGhY,1031
-mm_balance-0.2.2.dist-info/METADATA,sha256=Ck93hoOiO3Jq7kIHym9IN0XYMolvaYw6dGrhm_8II7I,225
-mm_balance-0.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_balance-0.2.2.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
-mm_balance-0.2.2.dist-info/RECORD,,