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

mm_balance/balances.py

@@ -8,9 +8,9 @@ from rich.progress import TaskID
 
 from mm_balance import output
 from mm_balance.config import Config
+from mm_balance.constants import Network
 from mm_balance.rpc import btc, eth, solana
 from mm_balance.token_decimals import TokenDecimals
-from mm_balance.types import Network
 
 
 class Balances:
@@ -32,9 +32,10 @@ class Balances:
             self.tasks[group.network].extend(task_list)
 
         for network in Network:
-            self.progress_bar_task[network] = output.create_progress_task(
-                self.progress_bar, network.value, len(self.tasks[network])
-            )
+            if self.tasks[network]:
+                self.progress_bar_task[network] = output.create_progress_task(
+                    self.progress_bar, network.value, len(self.tasks[network])
+                )
 
     def process(self) -> None:
         with self.progress_bar:
@@ -57,14 +58,14 @@ class Balances:
         proxies = self.config.proxies
         token_decimals = self.token_decimals[network][token_address] if token_address else -1
         match network:
-            case Network.BTC:
-                res = btc.get_balance(wallet_address, self.config)
-            case Network.ETH:
+            case Network.BITCOIN:
+                res = btc.get_balance(wallet_address, proxies, round_ndigits)
+            case Network.ETHEREUM | Network.ARBITRUM_ONE | Network.OP_MAINNET:
                 if token_address is None:
                     res = eth.get_native_balance(nodes, wallet_address, proxies, round_ndigits)
                 else:
                     res = eth.get_token_balance(nodes, wallet_address, token_address, token_decimals, proxies, round_ndigits)
-            case Network.SOL:
+            case Network.SOLANA:
                 if token_address is None:
                     res = solana.get_native_balance(nodes, wallet_address, proxies, round_ndigits)
                 else:
@@ -79,91 +80,3 @@ 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]
-
-
-# class Balances2(BaseModel):
-#     class Balance(BaseModel):
-#         group_index: int
-#         address: str
-#         token_address: str | None
-#         balance: Result[Decimal] | None = None
-#
-#     config: Config
-#     token_decimals: TokenDecimals
-#     # separate balance tasks on networks
-#     btc: list[Balance]
-#     eth: list[Balance]
-#     sol: list[Balance]
-#
-#     def network_tasks(self, network: Network) -> list[Balance]:
-#         if network == Network.BTC:
-#             return self.btc
-#         elif network == Network.ETH:
-#             return self.eth
-#         elif network == Network.SOL:
-#             return self.sol
-#         else:
-#             raise ValueError
-#
-#     def get_group_balances(self, group_index: int, network: Network) -> list[Balance]:
-#         # TODO: can we get network by group_index?
-#         if network == Network.BTC:
-#             network_balances = self.btc
-#         elif network == Network.ETH:
-#             network_balances = self.eth
-#         elif network == Network.SOL:
-#             network_balances = self.sol
-#         else:
-#             raise ValueError
-#
-#         return [b for b in network_balances if b.group_index == group_index]
-#
-#     def process(self) -> None:
-#         progress = output.create_progress_bar()
-#         task_btc = output.create_progress_task(progress, "btc", len(self.btc))
-#         task_eth = output.create_progress_task(progress, "eth", len(self.eth))
-#         task_sol = output.create_progress_task(progress, "sol", len(self.sol))
-#         with progress:
-#             job = ConcurrentTasks()
-#             job.add_task("btc", self._process_btc, args=(progress, task_btc))
-#             job.add_task("eth", self._process_eth, args=(progress, task_eth))
-#             job.add_task("sol", self._process_sol, args=(progress, task_sol))
-#             job.execute()
-#
-#     def _process_btc(self, progress: Progress, task_id: TaskID) -> None:
-#         job = ConcurrentTasks(max_workers=self.config.workers.btc)
-#         for idx, task in enumerate(self.btc):
-#             job.add_task(str(idx), btc.get_balance, args=(task.address, self.config, progress, task_id))
-#         job.execute()
-#         for idx, _task in enumerate(self.btc):
-#             self.btc[idx].balance = job.result.get(str(idx))  # type: ignore[assignment]
-#
-#     def _process_eth(self, progress: Progress, task_id: TaskID) -> None:
-#         job = ConcurrentTasks(max_workers=self.config.workers.eth)
-#         for idx, task in enumerate(self.eth):
-#             job.add_task(str(idx), self._get_balance,
-#                          args=(Network.ETH, task.address, task.token_address, self.config, progress, task_id))
-#         job.execute()
-#         for idx, _task in enumerate(self.eth):
-#             self.eth[idx].balance = job.result.get(str(idx))  # type: ignore[assignment]
-#
-#     def _process_sol(self, progress: Progress, task_id: TaskID) -> None:
-#         job = ConcurrentTasks(max_workers=self.config.workers.sol)
-#         for idx, task in enumerate(self.sol):
-#             job.add_task(str(idx), solana.get_balance, args=(task.address, self.config, progress, task_id))
-#         job.execute()
-#         for idx, _task in enumerate(self.sol):
-#             self.sol[idx].balance = job.result.get(str(idx))  # type: ignore[assignment]
-#
-#     @staticmethod
-#     def from_config(config: Config, token_decimals: TokenDecimals) -> Balances:
-#         tasks = Balances(config=config, btc=[], eth=[], sol=[], token_decimals=token_decimals)
-#         for idx, group in enumerate(config.groups):
-#             task_list = [Balances.Balance(group_index=idx, address=a, token_address=group.token_address) for a in group.addresses] # noqa
-#             if group.network == Network.BTC:
-#                 tasks.btc.extend(task_list)
-#             elif group.network == Network.ETH:
-#                 tasks.eth.extend(task_list)
-#             elif group.network == Network.SOL:
-#                 tasks.sol.extend(task_list)
-#         return tasks

mm_balance/cli.py

@@ -8,6 +8,7 @@ import typer
 from mm_balance import output
 from mm_balance.balances import Balances
 from mm_balance.config import Config
+from mm_balance.constants import Network
 from mm_balance.price import Prices, get_prices
 from mm_balance.token_decimals import get_token_decimals
 
@@ -21,10 +22,20 @@ def example_callback(value: bool) -> None:
         raise typer.Exit
 
 
+def networks_callback(value: bool) -> None:
+    if value:
+        for network in Network:
+            typer.echo(network)
+        raise typer.Exit
+
+
 @app.command()
 def cli(
     config_path: Annotated[pathlib.Path, typer.Argument()],
     _example: Annotated[bool | None, typer.Option("--example", callback=example_callback, help="Print a config example.")] = None,
+    _networks: Annotated[
+        bool | None, typer.Option("--networks", callback=networks_callback, help="Print supported networks.")
+    ] = None,
 ) -> None:
     zip_password = ""  # nosec
     if config_path.name.endswith(".zip"):
@@ -32,11 +43,12 @@ def cli(
     config = Config.read_config(config_path, zip_password=zip_password)
 
     prices = get_prices(config) if config.price else Prices()
+    output.print_prices(config, prices)
+
     token_decimals = get_token_decimals(config)
     balances = Balances(config, token_decimals)
     balances.process()
 
-    output.print_prices(config, prices)
     output.print_groups(balances, config, prices)
     output.print_total(config, balances, prices)
 

mm_balance/config/example.yml

@@ -1,14 +1,16 @@
-groups:
-  - coin: sol
+coins:
+  - ticker: SOL
+    network: solana
     addresses:
       - 2ojv9BAiHUrvsm9gxDe7fJSzbNZSJcxZvf8dqmWGHG8S # binance
 
-  - coin: usdt
-    network: sol
+  - ticker: USDT
+    network: solana
     addresses:
       - 2ojv9BAiHUrvsm9gxDe7fJSzbNZSJcxZvf8dqmWGHG8S # binance
 
-  - coin: btc
+  - ticker: BTC
+    network: bitcoin
     comment: coldwallets
     addresses: |
       34xp4vRoCGJym3xR7yCVPFHoCNxv4Twseo # binance
@@ -16,19 +18,23 @@ groups:
       bc1ql49ydapnjafl5t2cp9zqpjwe6pdgmxy98859v2 # robinhood
     share: 0.1 # 10%
 
-  - coin: eth
+  - ticker: ETH
+    network: ethereum
     comment: okx
     addresses: okx_eth
 
-  - coin: usdt
+  - ticker: USDT
+    network: ethereum
     comment: okx
     addresses: okx_eth
 
-  - coin: eth
+  - ticker: ETH
+    network: ethereum
     comment: binance
     addresses: binance_eth
 
-  - coin: usdt
+  - ticker: USDT
+    network: ethereum
     comment: binance
     addresses: binance_eth
 
@@ -53,4 +59,4 @@ addresses:
 #- http://123.123.123.123
 #- http://123.123.123.124
 #round_ndigits: 4
-#price: no
+#price: yes

mm_balance/config.py

@@ -1,73 +1,82 @@
 from __future__ import annotations
 
 from decimal import Decimal
-from typing import Any, Self
+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.types import DEFAULT_ETH_NODES, DEFAULT_SOL_NODES, EthTokenAddress, Network, SolTokenAddress
+from mm_balance.constants import (
+    DEFAULT_ARBITRUM_ONE_NODES,
+    DEFAULT_ETHEREUM_NODES,
+    DEFAULT_SOLANA_NODES,
+    TOKEN_ADDRESS,
+    Network,
+)
+
+
+class Group(BaseConfig):
+    comment: str = ""
+    ticker: str
+    network: Network
+    token_address: str | None = None
+    coingecko_id: str | None = None
+    addresses: list[str] = Field(default_factory=list)
+    share: Decimal = Decimal(1)
+
+    @property
+    def name(self) -> str:
+        result = self.ticker
+        if self.comment:
+            result += " / " + self.comment
+        result += " / " + self.network.value
+        return result
+
+    @field_validator("ticker", mode="after")
+    def coin_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:
+            self.token_address = detect_token_address(self.ticker, self.network)
+        if self.token_address is not None and self.network is Network.ETHEREUM:
+            self.token_address = self.token_address.lower()
+        return self
+
+    def process_addresses(self, address_groups: list[AddressGroup]) -> None:
+        addresses: list[str] = []
+        for address in self.addresses:
+            if address_group := pydash.find(address_groups, lambda g: g.name == address):  # noqa: B023
+                addresses.extend(address_group.addresses)
+            else:
+                # TODO: check address is valid
+                addresses.append(address)
+        self.addresses = addresses
+
+
+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)
 
 
 class Config(BaseConfig):
-    class Group(BaseConfig):
-        comment: str = ""
-        coin: str
-        network: Network
-        token_address: str | None = None
-        coingecko_id: str | None = None
-        addresses: list[str] = Field(default_factory=list)
-        share: Decimal = Decimal(1)
-
-        @property
-        def name(self) -> str:
-            result = self.coin
-            if self.comment:
-                result += " / " + self.comment
-            return result
-
-        @field_validator("coin", mode="after")
-        def coin_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:
-                self.token_address = detect_token_address(self.coin, self.network)
-            if self.token_address is not None and self.network is Network.ETH:
-                self.token_address = self.token_address.lower()
-            return self
-
-        def process_addresses(self, address_groups: list[Config.AddressGroup]) -> None:
-            addresses: list[str] = []
-            for address in self.addresses:
-                if address_group := pydash.find(address_groups, lambda g: g.name == address):  # noqa: B023
-                    addresses.extend(address_group.addresses)
-                else:
-                    # TODO: check address is valid
-                    addresses.append(address)
-            self.addresses = addresses
-
-    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)
-
-    groups: list[Group]
+    groups: list[Group] = Field(alias="coins")
     addresses: list[AddressGroup] = Field(default_factory=list)
 
     proxies_url: str | None = None
@@ -79,15 +88,6 @@ class Config(BaseConfig):
 
     workers: dict[Network, int] = {network: 5 for network in Network}
 
-    def btc_groups(self) -> list[Group]:
-        return [g for g in self.groups if g.network == Network.BTC]
-
-    def eth_groups(self) -> list[Group]:
-        return [g for g in self.groups if g.network == Network.ETH]
-
-    def sol_groups(self) -> list[Group]:
-        return [g for g in self.groups if g.network == Network.SOL]
-
     def has_share(self) -> bool:
         return any(g.share != Decimal(1) for g in self.groups)
 
@@ -102,40 +102,36 @@ class Config(BaseConfig):
             group.process_addresses(self.addresses)
 
         # load default rpc nodes
-        if Network.BTC not in self.nodes:
-            self.nodes[Network.BTC] = []
-        if Network.ETH not in self.nodes:
-            self.nodes[Network.ETH] = DEFAULT_ETH_NODES
-        if Network.SOL not in self.nodes:
-            self.nodes[Network.SOL] = DEFAULT_SOL_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
 
         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
-    # raise ValueError(f"can't get network for the coin: {coin}")
-
+# 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: str) -> str | None:
-    if network == Network.ETH.lower():
-        if coin.lower() == "usdt":
-            return EthTokenAddress.USDT
-        if coin.lower() == "usdc":
-            return EthTokenAddress.USDC
 
-    if network == Network.SOL.lower():
-        if coin.lower() == "usdt":
-            return SolTokenAddress.USDT
-        if coin.lower() == "usdc":
-            return SolTokenAddress.USDC
+def detect_token_address(coin: str, network: Network) -> str | None:
+    if network in TOKEN_ADDRESS:
+        return TOKEN_ADDRESS[network].get(coin)
 
 
 def get_proxies(proxies_url: str) -> list[str]:
@@ -149,5 +145,5 @@ def get_proxies(proxies_url: str) -> list[str]:
         fatal(f"Can't get  proxies: {err}")
 
 
-def get_address_group_by_name(address_groups: list[Config.AddressGroup], name: str) -> Config.AddressGroup | None:
+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/constants.py

@@ -0,0 +1,46 @@
+from __future__ import annotations
+
+from enum import Enum, unique
+
+RETRIES_BALANCE = 5
+RETRIES_DECIMALS = 5
+RETRIES_COINGECKO_PRICES = 5
+TIMEOUT_BALANCE = 5
+TIMEOUT_DECIMALS = 5
+
+
+@unique
+class Network(str, Enum):
+    ARBITRUM_ONE = "arbitrum-one"
+    BITCOIN = "bitcoin"
+    ETHEREUM = "ethereum"
+    SOLANA = "solana"
+    OP_MAINNET = "op-mainnet"  # Optimism mainnet
+
+
+TOKEN_ADDRESS: dict[Network, dict[str, str]] = {
+    Network.ETHEREUM: {
+        "USDT": "0xdac17f958d2ee523a2206206994597c13d831ec7",
+        "USDC": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
+    },
+    Network.SOLANA: {
+        "USDT": "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB",
+        "USDC": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
+    },
+    # TODO: Add for Arbitrum and Optimism, usdt + usdc
+}
+
+TICKER_TO_COINGECKO_ID = {
+    "BTC": "bitcoin",
+    "ETH": "ethereum",
+    "USDT": "tether",
+    "USDC": "usd-coin",
+    "SOL": "solana",
+}
+
+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"]

mm_balance/output.py

@@ -4,7 +4,7 @@ from mm_std import Ok, print_table
 from rich.progress import BarColumn, MofNCompleteColumn, Progress, TaskID, TextColumn
 
 from mm_balance.balances import Balances
-from mm_balance.config import Config
+from mm_balance.config import Config, Group
 from mm_balance.price import Prices
 from mm_balance.total import Total
 
@@ -15,7 +15,7 @@ def print_groups(balances: Balances, config: Config, prices: Prices) -> None:
         _print_group(group, group_balances, config, prices)
 
 
-def _print_group(group: Config.Group, group_balances: list[Balances.Balance], config: Config, prices: Prices) -> None:
+def _print_group(group: Group, group_balances: list[Balances.Balance], config: Config, prices: Prices) -> None:
     rows = []
     balance_sum = Decimal(0)
     usd_sum = Decimal(0)
@@ -24,7 +24,7 @@ def _print_group(group: Config.Group, group_balances: list[Balances.Balance], co
         if isinstance(address_task.balance, Ok):
             balance_sum += address_task.balance.ok
             if config.price:
-                balance_usd = round(address_task.balance.ok * prices[group.coin], config.round_ndigits)
+                balance_usd = round(address_task.balance.ok * prices[group.ticker], config.round_ndigits)
                 usd_sum += balance_usd
                 row.append(f"${balance_usd}")
         rows.append(row)

mm_balance/price.py

@@ -1,13 +1,11 @@
-import time
 from decimal import Decimal
 
 import pydash
-from mm_std import Err, Ok, Result, fatal, hr
+from mm_std import fatal, hr
 from mm_std.random_ import random_str_choice
 
-from mm_balance import output
-from mm_balance.config import Config
-from mm_balance.types import EthTokenAddress, Network
+from mm_balance.config import Config, Group
+from mm_balance.constants import RETRIES_COINGECKO_PRICES, Network
 
 
 class Prices(dict[str, Decimal]):
@@ -21,63 +19,48 @@ class Prices(dict[str, Decimal]):
 
 def get_prices(config: Config) -> Prices:
     result = Prices()
-    coins_total = len(pydash.uniq([group.coin for group in config.groups]))
 
-    progress = output.create_progress_bar()
+    coins = pydash.uniq([group.ticker for group in config.groups])
+    coingecko_ids = pydash.uniq([get_coingecko_id(group) for group in config.groups])
 
-    with progress:
-        task_id = output.create_progress_task(progress, "prices", total=coins_total)
+    url = f"https://api.coingecko.com/api/v3/simple/price?ids={",".join(coingecko_ids)}&vs_currencies=usd"
+    for _ in range(RETRIES_COINGECKO_PRICES):
+        res = hr(url, proxy=random_str_choice(config.proxies))
+        if res.code != 200:
+            continue
 
-        for group in config.groups:
-            if group.coin in result:
-                continue
-
-            coingecko_id = get_coingecko_id(group)
-            res = get_asset_price(coingecko_id, config.proxies)
-            if isinstance(res, Ok):
-                result[group.coin] = res.ok
-                progress.update(task_id, advance=1)
+        for idx, coin in enumerate(coins):
+            if coingecko_ids[idx] in res.json:
+                result[coin] = Decimal(str(pydash.get(res.json, f"{coingecko_ids[idx]}.usd")))
             else:
-                fatal(res.err)
-                # raise ValueError(res.err)
+                fatal("Can't get price for {coin} from coingecko, coingecko_id={coingecko_ids[idx]}")
 
     return result
 
 
-def get_asset_price(coingecko_asset_id: str, proxies: list[str]) -> Result[Decimal]:
-    url = f"https://api.coingecko.com/api/v3/simple/price?ids={coingecko_asset_id}&vs_currencies=usd"
-    data = None
-    error = f"error: can't get price for {coingecko_asset_id} from coingecko"
-    for _ in range(3):
-        res = hr(url, proxy=random_str_choice(proxies))
-
-        # Check for Rate Limit
-        if res.code == 429:
-            error = f"error: can't get price for {coingecko_asset_id} from coingecko. You've exceeded the Rate Limit. Please add more proxies."  # noqa: E501
-            if not proxies:
-                fatal(error)  # Exit immidiately if no proxies are provided
-
-        data = res.to_dict()
-        if res.json and coingecko_asset_id in coingecko_asset_id in res.json:
-            return Ok(Decimal(pydash.get(res.json, f"{coingecko_asset_id}.usd")))
+TICKER_TO_COINGECKO_ID = {
+    "BTC": "bitcoin",
+    "ETH": "ethereum",
+    "USDT": "tether",
+    "USDC": "usd-coin",
+    "SOL": "solana",
+}
 
-        if not proxies:
-            time.sleep(10)
-    return Err(error, data=data)
 
-
-def get_coingecko_id(group: Config.Group) -> str:
+def get_coingecko_id(group: Group) -> str:
     if group.coingecko_id:
         return group.coingecko_id
-    elif group.network is Network.BTC:
+    elif group.network is Network.BITCOIN:
         return "bitcoin"
-    elif group.network is Network.ETH and group.token_address is None:
+    elif group.network is Network.ETHEREUM and group.token_address is None:
+        return "ethereum"
+    elif group.ticker == "ETH":
         return "ethereum"
-    elif group.coin.lower() == "usdt" or (group.token_address is not None and group.token_address == EthTokenAddress.USDT):
+    elif group.ticker == "USDT":
         return "tether"
-    elif group.coin.lower() == "usdc" or (group.token_address is not None and group.token_address == EthTokenAddress.USDC):
+    elif group.ticker == "USDC":
         return "usd-coin"
-    elif group.coin.lower() == "sol":
+    elif group.ticker == "SOL":
         return "solana"
 
-    raise ValueError(f"can't get coingecko_id for {group.coin}")
+    raise ValueError(f"can't get coingecko_id for {group.ticker}")

mm_balance/rpc/btc.py

@@ -2,19 +2,15 @@ from decimal import Decimal
 
 from mm_btc.blockstream import BlockstreamClient
 from mm_std import Ok, Result
-from rich.progress import Progress, TaskID
 
-from mm_balance.config import Config
+from mm_balance.constants import RETRIES_BALANCE
 
 
-def get_balance(address: str, config: Config, progress: Progress | None = None, task_id: TaskID | None = None) -> Result[Decimal]:
-    res: Result[Decimal] = (
-        BlockstreamClient(proxies=config.proxies, attempts=3)
+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), config.round_ndigits)),
+            lambda b: Ok(round(Decimal(b / 100_000_000), round_ndigits)),
         )
     )
-    if task_id is not None and progress is not None:
-        progress.update(task_id, advance=1)
-    return res

mm_balance/rpc/eth.py

@@ -3,9 +3,11 @@ from decimal import Decimal
 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
+
 
 def get_native_balance(nodes: list[str], address: str, proxies: list[str], round_ndigits: int) -> Result[Decimal]:
-    return rpc.eth_get_balance(nodes, address, proxies=proxies, attempts=5, timeout=10).and_then(
+    return rpc.eth_get_balance(nodes, address, proxies=proxies, attempts=RETRIES_BALANCE, timeout=TIMEOUT_BALANCE).and_then(
         lambda b: Ok(round(Decimal(b / 10**18), round_ndigits)),
     )
 
@@ -18,29 +20,12 @@ def get_token_balance(
         token_address,
         wallet_address,
         proxies=proxies,
-        attempts=5,
-        timeout=10,
+        attempts=RETRIES_BALANCE,
+        timeout=TIMEOUT_BALANCE,
     ).and_then(
         lambda b: Ok(round(Decimal(b / 10**decimals), round_ndigits)),
     )
 
 
 def get_token_decimals(nodes: list[str], token_address: str, proxies: list[str]) -> Result[int]:
-    return erc20.get_decimals(nodes, token_address, timeout=10, proxies=proxies, attempts=5)
-
-
-# def get_balance(
-#         address: str, token_address: str | None, config: Config, progress: Progress | None = None, task_id: TaskID | None = None
-# ) -> Result[Decimal]:
-#     res: Result[Decimal]
-#
-#     if token_address is not None:
-#
-#     else:
-#         res = rpc.eth_get_balance(config.nodes[Network.ETH], address, proxies=config.proxies, attempts=5, timeout=10).and_then(
-#             lambda b: Ok(round(Decimal(b / 10 ** 18), config.round_ndigits)),
-#         )
-#
-#     if task_id is not None and progress is not None:
-#         progress.update(task_id, advance=1)
-#     return res
+    return erc20.get_decimals(nodes, token_address, timeout=TIMEOUT_DECIMALS, proxies=proxies, attempts=RETRIES_DECIMALS)

mm_balance/rpc/solana.py

@@ -3,20 +3,24 @@ from decimal import Decimal
 from mm_solana import balance, token
 from mm_std import Ok, Result
 
+from mm_balance.constants import RETRIES_BALANCE, RETRIES_DECIMALS, TIMEOUT_BALANCE, TIMEOUT_DECIMALS
+
 
 def get_native_balance(nodes: list[str], address: str, proxies: list[str], round_ndigits: int) -> Result[Decimal]:
-    return balance.get_balance_with_retries(nodes, address, retries=5, timeout=5, proxies=proxies).and_then(
-        lambda b: Ok(round(Decimal(b / 1_000_000_000), round_ndigits)),
-    )
+    return balance.get_balance_with_retries(
+        nodes, address, retries=RETRIES_BALANCE, timeout=TIMEOUT_BALANCE, proxies=proxies
+    ).and_then(lambda b: Ok(round(Decimal(b / 1_000_000_000), round_ndigits)))
 
 
 def get_token_balance(
     nodes: list[str], wallet_address: str, token_address: str, decimals: int, proxies: list[str], round_ndigits: int
 ) -> Result[Decimal]:
-    return token.get_balance_with_retries(nodes, wallet_address, token_address, retries=5, timeout=5, proxies=proxies).and_then(
-        lambda b: Ok(round(Decimal(b / 10**decimals), round_ndigits))
-    )
+    return token.get_balance_with_retries(
+        nodes, wallet_address, token_address, retries=RETRIES_BALANCE, timeout=TIMEOUT_BALANCE, proxies=proxies
+    ).and_then(lambda b: Ok(round(Decimal(b / 10**decimals), round_ndigits)))
 
 
 def get_token_decimals(nodes: list[str], token_address: str, proxies: list[str]) -> Result[int]:
-    return token.get_decimals_with_retries(nodes, token_address, retries=5, timeout=5, proxies=proxies)
+    return token.get_decimals_with_retries(
+        nodes, token_address, retries=RETRIES_DECIMALS, timeout=TIMEOUT_DECIMALS, proxies=proxies
+    )

mm_balance/token_decimals.py

@@ -1,8 +1,8 @@
 from mm_std import Err, fatal
 
 from mm_balance.config import Config
+from mm_balance.constants import Network
 from mm_balance.rpc import eth, solana
-from mm_balance.types import Network
 
 
 class TokenDecimals(dict[Network, dict[str, int]]):
@@ -23,15 +23,15 @@ def get_token_decimals(config: Config) -> TokenDecimals:
         proxies = config.proxies
 
         match group.network:
-            case Network.ETH:
+            case Network.ETHEREUM:
                 decimals_res = eth.get_token_decimals(nodes, group.token_address, proxies)
-            case Network.SOL:
+            case Network.SOLANA:
                 decimals_res = solana.get_token_decimals(nodes, group.token_address, proxies)
             case _:
                 raise ValueError(f"unsupported network: {group.network}. Cant get token decimals for {group.token_address}")
 
         if isinstance(decimals_res, Err):
-            fatal(f"can't get decimals for token {group.coin} / {group.token_address}, error={decimals_res.err}")
+            fatal(f"can't get decimals for token {group.ticker} / {group.token_address}, error={decimals_res.err}")
         result[group.network][group.token_address] = decimals_res.ok
 
     return result

mm_balance/total.py

@@ -7,8 +7,8 @@ from mm_std import Ok, PrintFormat, print_table
 
 from mm_balance.balances import Balances
 from mm_balance.config import Config
+from mm_balance.constants import USD_STABLECOINS
 from mm_balance.price import Prices
-from mm_balance.types import Coin
 
 
 @dataclass
@@ -38,16 +38,16 @@ class Total:
             for address_task in balances.get_group_balances(group_index, group.network):
                 if isinstance(address_task.balance, Ok):
                     balance_sum += address_task.balance.ok
-                    if group.coin in Coin.usd_coins():
+                    if group.ticker in USD_STABLECOINS:
                         stablecoin_sum += address_task.balance.ok
                         stablecoin_sum_share += address_task.balance.ok * group.share
                     if config.price:
-                        balance_usd = round(address_task.balance.ok * prices[group.coin], config.round_ndigits)
+                        balance_usd = round(address_task.balance.ok * prices[group.ticker], config.round_ndigits)
                         usd_sum += balance_usd
                         usd_sum_share += group.share * balance_usd
 
-            coins[group.coin] += balance_sum
-            coins_share[group.coin] += round(balance_sum * group.share, config.round_ndigits)
+            coins[group.ticker] += balance_sum
+            coins_share[group.ticker] += round(balance_sum * group.share, config.round_ndigits)
         return cls(
             coins=coins,
             coins_share=coins_share,
@@ -78,7 +78,7 @@ class Total:
             rows = []
             for key, value in self.coins.items():
                 usd_value = round(value * self.prices[key], self.config.round_ndigits)
-                if key in Coin.usd_coins():
+                if key in USD_STABLECOINS:
                     usd_share = round(self.stablecoin_sum * 100 / self.usd_sum, self.config.round_ndigits)
                 else:
                     usd_share = round(usd_value * 100 / self.usd_sum, self.config.round_ndigits)
@@ -97,7 +97,7 @@ class Total:
         rows = []
         for key, _ in self.coins.items():
             usd_value = round(self.coins_share[key] * self.prices[key], self.config.round_ndigits)
-            if key in Coin.usd_coins():
+            if key in USD_STABLECOINS:
                 usd_share = round(self.stablecoin_sum_share * 100 / self.usd_sum_share, self.config.round_ndigits)
             else:
                 usd_share = round(usd_value * 100 / self.usd_sum_share, self.config.round_ndigits)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mm-balance
-Version: 0.1.10
+Version: 0.1.12
 Requires-Python: >=3.12
 Requires-Dist: mm-btc==0.1.0
 Requires-Dist: mm-eth==0.1.3

mm_balance-0.1.12.dist-info/RECORD

@@ -0,0 +1,18 @@
+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,,

mm_balance/types.py

@@ -1,38 +0,0 @@
-from __future__ import annotations
-
-from enum import Enum, unique
-
-DEFAULT_ETH_NODES = ["https://ethereum.publicnode.com", "https://rpc.ankr.com/eth"]
-DEFAULT_SOL_NODES = ["https://api.mainnet-beta.solana.com"]
-
-
-@unique
-class Coin(str, Enum):
-    BTC = "BTC"
-    ETH = "ETH"
-    SOL = "SOL"
-    USDT = "USDT"
-    USDC = "USDC"
-
-    @classmethod
-    def usd_coins(cls) -> list[Coin]:
-        return [Coin.USDT, Coin.USDC]
-
-
-@unique
-class Network(str, Enum):
-    BTC = "btc"
-    ETH = "eth"
-    SOL = "sol"
-
-
-@unique
-class EthTokenAddress(str, Enum):
-    USDT = "0xdac17f958d2ee523a2206206994597c13d831ec7"
-    USDC = "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
-
-
-@unique
-class SolTokenAddress(str, Enum):
-    USDT = "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB"
-    USDC = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"

mm_balance-0.1.10.dist-info/RECORD

@@ -1,18 +0,0 @@
-mm_balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/balances.py,sha256=iERBZ_kTqj1wSlwUv5O2OteEhK2FMttD8Enx2avQHm0,7572
-mm_balance/cli.py,sha256=qKmupsRR3dGKZzA5hrKgmd4N4SoRMKTI8HAiwhSvgXI,1359
-mm_balance/config.py,sha256=n6NbsgnB-Uus4kOZJr37n7BnHc539LH8LT6BpJbqhVU,5370
-mm_balance/output.py,sha256=Sb0pccEBNOCR9fuMigO9GJcyTNw9XPRZXTg8iznJKFQ,2568
-mm_balance/price.py,sha256=KyMx1T57SczKbYmbghpGty9BrPebrZdjBW0_BaabKDk,2926
-mm_balance/token_decimals.py,sha256=UlYzLFR_w-jAsotq8CjGJc38KwklWG0Tr0JK-_wK6QQ,1293
-mm_balance/total.py,sha256=OuXfKKy18X9f7HO_RJNFh4M8VPVH0MBb3soSRsqS_RY,4696
-mm_balance/types.py,sha256=O6mjf2UYSl2XzwMU8Zsg_T2iYdSxZPg2-7UV1UORaMU,822
-mm_balance/config/example.yml,sha256=A3pGt8BVykKNajfhHziTM7RLM1KSZOm_kmhCQExQkgo,1336
-mm_balance/rpc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/rpc/btc.py,sha256=OozGSF8CzR13jxTYjvBqkC8d0pdKkyEHxM7e7M_WbV0,681
-mm_balance/rpc/eth.py,sha256=vWjgvP2P_ejwK_dsxS3NZCP0PJyLFDndvfVaZIePXOU,1578
-mm_balance/rpc/solana.py,sha256=NIa494HjvHYONutKV_6HGcJV5tqiRvA1099JVkrrdd8,972
-mm_balance-0.1.10.dist-info/METADATA,sha256=fDZjEFqUMNBwhqwoyG0ldd65jlV2EEqnKhZ00PynqN0,198
-mm_balance-0.1.10.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-mm_balance-0.1.10.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
-mm_balance-0.1.10.dist-info/RECORD,,