mm-balance 0.1.12__py3-none-any.whl → 0.1.13__py3-none-any.whl

mm_balance/balances.py

@@ -80,3 +80,11 @@ class Balances:
     def get_group_balances(self, group_index: int, network: Network) -> list[Balance]:
         # TODO: can we get network by group_index?
         return [b for b in self.tasks[network] if b.group_index == group_index]
+
+    def get_errors(self) -> list[Balance]:
+        result = []
+        for network in self.tasks:
+            for task in self.tasks[network]:
+                if task.balance is not None and task.balance.is_err():
+                    result.append(task)
+        return result

mm_balance/cli.py

@@ -51,6 +51,7 @@ def cli(
 
     output.print_groups(balances, config, prices)
     output.print_total(config, balances, prices)
+    output.print_errors(config, balances)
 
 
 if __name__ == "__main__":

mm_balance/config/example.yml

@@ -60,3 +60,4 @@ addresses:
 #- http://123.123.123.124
 #round_ndigits: 4
 #price: yes
+#skip_empty: no

mm_balance/config.py

@@ -1,19 +1,14 @@
 from __future__ import annotations
 
 from decimal import Decimal
+from pathlib import Path
 from typing import Self
 
 import pydash
 from mm_std import BaseConfig, PrintFormat, fatal, hr
 from pydantic import Field, field_validator, model_validator
 
-from mm_balance.constants import (
-    DEFAULT_ARBITRUM_ONE_NODES,
-    DEFAULT_ETHEREUM_NODES,
-    DEFAULT_SOLANA_NODES,
-    TOKEN_ADDRESS,
-    Network,
-)
+from mm_balance.constants import DEFAULT_NODES, TOKEN_ADDRESS, Network
 
 
 class Group(BaseConfig):
@@ -34,7 +29,7 @@ class Group(BaseConfig):
         return result
 
     @field_validator("ticker", mode="after")
-    def coin_validator(cls, v: str) -> str:
+    def ticker_validator(cls, v: str) -> str:
         return v.upper()
 
     @field_validator("addresses", mode="before")
@@ -63,7 +58,7 @@ class Group(BaseConfig):
             else:
                 # TODO: check address is valid
                 addresses.append(address)
-        self.addresses = addresses
+        self.addresses = pydash.uniq(process_file_addresses(addresses))
 
 
 class AddressGroup(BaseConfig):
@@ -85,6 +80,7 @@ class Config(BaseConfig):
     nodes: dict[Network, list[str]] = Field(default_factory=dict)
     print_format: PrintFormat = PrintFormat.TABLE
     price: bool = True
+    skip_empty: bool = False  # don't print the address with an empty balance
 
     workers: dict[Network, int] = {network: 5 for network in Network}
 
@@ -102,36 +98,16 @@ class Config(BaseConfig):
             group.process_addresses(self.addresses)
 
         # load default rpc nodes
-        if Network.BITCOIN not in self.nodes:
-            self.nodes[Network.BITCOIN] = []
-        if Network.ETHEREUM not in self.nodes:
-            self.nodes[Network.ETHEREUM] = DEFAULT_ETHEREUM_NODES
-        if Network.ARBITRUM_ONE not in self.nodes:
-            self.nodes[Network.ARBITRUM_ONE] = DEFAULT_ARBITRUM_ONE_NODES
-        if Network.OP_MAINNET not in self.nodes:
-            self.nodes[Network.OP_MAINNET] = DEFAULT_ARBITRUM_ONE_NODES
-        if Network.SOLANA not in self.nodes:
-            self.nodes[Network.SOLANA] = DEFAULT_SOLANA_NODES
+        for network in Network:
+            if network not in self.nodes:
+                self.nodes[network] = DEFAULT_NODES[network]
 
         return self
 
 
-# def detect_network(coin: str) -> Network:
-#
-#     # coin = coin.lower()
-#     # if coin == "btc":
-#     #     return Network.BTC
-#     # if coin == "eth":
-#     #     return Network.ETH
-#     # if coin == "sol":
-#     #     return Network.SOL
-#     # return Network.ETH
-#     # # TODO: raise ValueError(f"can't get network for the coin: {coin}")
-
-
-def detect_token_address(coin: str, network: Network) -> str | None:
+def detect_token_address(ticker: str, network: Network) -> str | None:
     if network in TOKEN_ADDRESS:
-        return TOKEN_ADDRESS[network].get(coin)
+        return TOKEN_ADDRESS[network].get(ticker)
 
 
 def get_proxies(proxies_url: str) -> list[str]:
@@ -147,3 +123,17 @@ def get_proxies(proxies_url: str) -> list[str]:
 
 def get_address_group_by_name(address_groups: list[AddressGroup], name: str) -> AddressGroup | None:
     return pydash.find(address_groups, lambda g: g.name == name)
+
+
+def process_file_addresses(addresses: list[str]) -> list[str]:
+    result = []
+    for address in addresses:
+        if address.startswith("file://"):
+            path = Path(address.removeprefix("file://"))
+            if path.is_file():
+                result.extend(path.read_text().strip().splitlines())
+            else:
+                fatal(f"File with addresses not found: {path}")
+        else:
+            result.append(address)
+    return result

mm_balance/constants.py

@@ -27,7 +27,14 @@ TOKEN_ADDRESS: dict[Network, dict[str, str]] = {
         "USDT": "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB",
         "USDC": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
     },
-    # TODO: Add for Arbitrum and Optimism, usdt + usdc
+    Network.ARBITRUM_ONE: {
+        "USDT": "0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9",
+        "USDC": "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8",
+    },
+    Network.OP_MAINNET: {
+        "USDT": "0x94b008aA00579c1307B0EF2c499aD98a8ce58e58",
+        "USDC": "0x7f5c764cbc14f9669b88837ca1490cca17c31607",
+    },
 }
 
 TICKER_TO_COINGECKO_ID = {
@@ -40,7 +47,10 @@ TICKER_TO_COINGECKO_ID = {
 
 USD_STABLECOINS = ["USDT", "USDC"]
 
-DEFAULT_ETHEREUM_NODES = ["https://ethereum.publicnode.com", "https://rpc.ankr.com/eth"]
-DEFAULT_SOLANA_NODES = ["https://api.mainnet-beta.solana.com"]
-DEFAULT_ARBITRUM_ONE_NODES = ["https://arb1.arbitrum.io/rpc", "https://arbitrum.llamarpc.com"]
-DEFAULT_OP_MAINNET_NODES = ["https://mainnet.optimism.io", "https://optimism.llamarpc.com"]
+DEFAULT_NODES: dict[Network, list[str]] = {
+    Network.ARBITRUM_ONE: ["https://arb1.arbitrum.io/rpc", "https://arbitrum.llamarpc.com"],
+    Network.BITCOIN: [],
+    Network.ETHEREUM: ["https://ethereum.publicnode.com", "https://rpc.ankr.com/eth"],
+    Network.SOLANA: ["https://api.mainnet-beta.solana.com"],
+    Network.OP_MAINNET: ["https://mainnet.optimism.io", "https://optimism.llamarpc.com"],
+}

mm_balance/output.py

@@ -20,6 +20,8 @@ def _print_group(group: Group, group_balances: list[Balances.Balance], config: C
     balance_sum = Decimal(0)
     usd_sum = Decimal(0)
     for address_task in group_balances:
+        if config.skip_empty and isinstance(address_task.balance, Ok) and address_task.balance.ok == Decimal(0):
+            continue
         row = [address_task.address, address_task.balance.ok_or_err()]  # type: ignore[union-attr]
         if isinstance(address_task.balance, Ok):
             balance_sum += address_task.balance.ok
@@ -57,6 +59,17 @@ def print_total(config: Config, balances: Balances, prices: Prices) -> None:
     total.print()
 
 
+def print_errors(config: Config, balances: Balances) -> None:
+    error_balances = balances.get_errors()
+    if not error_balances:
+        return
+    rows = []
+    for balance in error_balances:
+        group = config.groups[balance.group_index]
+        rows.append([group.ticker + " / " + group.network, balance.address, balance.balance.err])  # type: ignore[union-attr]
+    print_table("Errors", ["coin", "address", "error"], rows)
+
+
 def create_progress_bar() -> Progress:
     return Progress(
         TextColumn("[progress.description]{task.description}"),

{mm_balance-0.1.12.dist-info → mm_balance-0.1.13.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.3
 Name: mm-balance
-Version: 0.1.12
+Version: 0.1.13
 Requires-Python: >=3.12
 Requires-Dist: mm-btc==0.1.0
 Requires-Dist: mm-eth==0.1.3
-Requires-Dist: mm-solana==0.1.4
+Requires-Dist: mm-solana==0.1.5
 Requires-Dist: typer>=0.12.5

mm_balance-0.1.13.dist-info/RECORD

@@ -0,0 +1,18 @@
+mm_balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_balance/balances.py,sha256=yk4gqfdBiBuq8SX4BzObBz_yYh3d6DJ-iDcvaSZFrFM,3939
+mm_balance/cli.py,sha256=B8YDx2ltqIu1jJoxLA514Y1A-bcrNPEN6nK73ZYIyZc,1742
+mm_balance/config.py,sha256=4NOp8CploUsDCYAJedBBEfgyGtREhcmmg3r2q2emeX4,4744
+mm_balance/constants.py,sha256=vtISLm13dAVaJEtZYAyNlvZp8LwiYoEsXjcMBmr1xzE,1632
+mm_balance/output.py,sha256=r2h3NQ5cZ9uWyGP0bfzYwVgS8TnNwj5zTcJbcY01zBo,3141
+mm_balance/price.py,sha256=wlClQNW03BSzq8gxQxH9f5LnwRFZBqeI-tfY9vtlSJE,2005
+mm_balance/token_decimals.py,sha256=iNhAEEPfg8MvjxBGnFdxh82pYg3v26w4s9xro2Emoi8,1307
+mm_balance/total.py,sha256=PERRR9m77LBgu30tUEdyfGdtmVDFa-dICq8S9zcH1eA,4716
+mm_balance/config/example.yml,sha256=oMg0bBygKFprcf3anW5nb0lkpl0Bc3cQ5eKTeEpiM_k,1498
+mm_balance/rpc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_balance/rpc/btc.py,sha256=ugp90H7YW0kiXIh98bQWk9mQTW20yE-jBiCpRvfoH-U,481
+mm_balance/rpc/eth.py,sha256=G7aYjTw6xJwcsAyIp9eVW8NRVDUGeTCpdbd-CqgqHyw,1167
+mm_balance/rpc/solana.py,sha256=vmCAaeQKwxg95qdSmUEjFS9bAPUJVx8irtWv6nlRBvU,1174
+mm_balance-0.1.13.dist-info/METADATA,sha256=pEBa6u5nBDTruCLZzIDBjSub0hk6jaLzZuWTvE5v9dQ,198
+mm_balance-0.1.13.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+mm_balance-0.1.13.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
+mm_balance-0.1.13.dist-info/RECORD,,

mm_balance-0.1.12.dist-info/RECORD

@@ -1,18 +0,0 @@
-mm_balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/balances.py,sha256=4PjyxEynkv_59cs6-HujU3rn18DebotnWIu8Sa1Jj9s,3662
-mm_balance/cli.py,sha256=GZB3MgYxOV5AWhX2NvU9LWKF7I2iNQzyhgC2oKlOODU,1700
-mm_balance/config.py,sha256=I1QmL5Nlyyifn78wmndnw5zi-zk_B-paK42KTd4pRb4,4995
-mm_balance/constants.py,sha256=J0N8GmWAagKGyJ8DMnmxhU6LXEkvKhYiJpacKqxkQ4s,1308
-mm_balance/output.py,sha256=5y35jJUDJqrz86EVNklBVa06b1ia0ppy2ypTy9Jkbb0,2570
-mm_balance/price.py,sha256=wlClQNW03BSzq8gxQxH9f5LnwRFZBqeI-tfY9vtlSJE,2005
-mm_balance/token_decimals.py,sha256=iNhAEEPfg8MvjxBGnFdxh82pYg3v26w4s9xro2Emoi8,1307
-mm_balance/total.py,sha256=PERRR9m77LBgu30tUEdyfGdtmVDFa-dICq8S9zcH1eA,4716
-mm_balance/config/example.yml,sha256=KxSmjIKY1LXjUzfA4sv3j352fVePRDEeqG48xEwKWkc,1482
-mm_balance/rpc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/rpc/btc.py,sha256=ugp90H7YW0kiXIh98bQWk9mQTW20yE-jBiCpRvfoH-U,481
-mm_balance/rpc/eth.py,sha256=G7aYjTw6xJwcsAyIp9eVW8NRVDUGeTCpdbd-CqgqHyw,1167
-mm_balance/rpc/solana.py,sha256=vmCAaeQKwxg95qdSmUEjFS9bAPUJVx8irtWv6nlRBvU,1174
-mm_balance-0.1.12.dist-info/METADATA,sha256=fYBCpx8m2vk02CTT-tJskdEZoi_wZkBdXc8cprDU4_8,198
-mm_balance-0.1.12.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-mm_balance-0.1.12.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
-mm_balance-0.1.12.dist-info/RECORD,,