mm-balance 0.1.12__tar.gz → 0.1.13__tar.gz

{mm_balance-0.1.12 → mm_balance-0.1.13}/PKG-INFO

@@ -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.12 → mm_balance-0.1.13}/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "mm-balance"
-version = "0.1.12"
+version = "0.1.13"
 description = ""
 requires-python = ">=3.12"
 dependencies = [
     "mm-btc==0.1.0",
     "mm-eth==0.1.3",
-    "mm-solana==0.1.4",
+    "mm-solana==0.1.5",
     "typer>=0.12.5",
 ]
 [project.scripts]

{mm_balance-0.1.12 → mm_balance-0.1.13}/src/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-0.1.12 → mm_balance-0.1.13}/src/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-0.1.12 → mm_balance-0.1.13}/src/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-0.1.12 → mm_balance-0.1.13}/src/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-0.1.12 → mm_balance-0.1.13}/src/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-0.1.12 → mm_balance-0.1.13}/src/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 → mm_balance-0.1.13}/uv.lock

@@ -925,7 +925,7 @@ wheels = [
 
 [[package]]
 name = "mm-balance"
-version = "0.1.12"
+version = "0.1.13"
 source = { editable = "." }
 dependencies = [
     { name = "mm-btc" },
@@ -952,7 +952,7 @@ dev = [
 requires-dist = [
     { name = "mm-btc", specifier = "==0.1.0" },
     { name = "mm-eth", specifier = "==0.1.3" },
-    { name = "mm-solana", specifier = "==0.1.4" },
+    { name = "mm-solana", specifier = "==0.1.5" },
     { name = "typer", specifier = ">=0.12.5" },
 ]
 
@@ -1004,7 +1004,7 @@ wheels = [
 
 [[package]]
 name = "mm-solana"
-version = "0.1.4"
+version = "0.1.5"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "base58" },
@@ -1015,9 +1015,9 @@ dependencies = [
     { name = "solana" },
     { name = "typer" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/99/9d/307c404ec6718192faebab8860fb352a667aa9903e0e58489be5f9270af1/mm_solana-0.1.4.tar.gz", hash = "sha256:fd719306c26a4f1347cc63f58dd3561b416da66fe7a615cb2a9b383b3d986268", size = 51285 }
+sdist = { url = "https://files.pythonhosted.org/packages/d9/ad/2cd6a536f8d314e2fc37d85d00b1a3a67e1731fded3b4fa82a9ca18c4eec/mm_solana-0.1.5.tar.gz", hash = "sha256:00be9fe5486484b6f31240b76ea7c7a33d364f818252bd3bb314b9b6926aed8c", size = 51391 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/db/ea/901bd6a050fc888c3264d5cf87c37d13b9ffe6373d3319639c9a5c39d5c9/mm_solana-0.1.4-py3-none-any.whl", hash = "sha256:84c966bdbc12e85430ef26237d23ef296f5df9ae915b3153ad952537780f1e83", size = 18913 },
+    { url = "https://files.pythonhosted.org/packages/29/53/75850218681cfe1a5b3bff02703193cfa89d7c41d776718df6a2c183774f/mm_solana-0.1.5-py3-none-any.whl", hash = "sha256:4d441791b8c14134651d9b27a3bee617b565b6390ad47a012efe4ad42eca8b92", size = 18927 },
 ]
 
 [[package]]