mm-sol 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

mm_sol/cli/cli.py

@@ -110,9 +110,10 @@ def wallet_mnemonic_command(  # nosec
     mnemonic: Annotated[str, typer.Option("--mnemonic", "-m")] = "",
     passphrase: Annotated[str, typer.Option("--passphrase", "-p")] = "",
     derivation_path: Annotated[str, typer.Option("--path")] = PHANTOM_DERIVATION_PATH,
-    limit: int = typer.Option(10, "--limit", "-l"),
+    words: int = typer.Option(12, "--words", "-w", help="Number of mnemonic words"),
+    limit: int = typer.Option(5, "--limit", "-l"),
 ) -> None:
-    mnemonic_cmd.run(mnemonic, passphrase, derivation_path, limit)
+    mnemonic_cmd.run(mnemonic, passphrase, words, derivation_path, limit)
 
 
 @wallet_app.command(name="keypair", help="Print public, private_base58, private_arr by a private key")

mm_sol/cli/cmd/balances_cmd.py

@@ -4,13 +4,14 @@ from pathlib import Path
 from typing import Annotated, Any
 
 from mm_crypto_utils import ConfigValidators
-from mm_std import BaseConfig, print_json
+from mm_std import BaseConfig, Err, fatal, print_json
 from pydantic import BeforeValidator
 
 import mm_sol.converters
 from mm_sol import balance
 from mm_sol.balance import get_token_balance_with_retries
 from mm_sol.cli.validators import Validators
+from mm_sol.token import get_decimals_with_retries
 
 
 class Config(BaseConfig):
@@ -34,22 +35,31 @@ def run(config_path: Path, print_config: bool) -> None:
 
     if config.tokens:
         for token in config.tokens:
-            result[token] = _get_token_balances(token, config.accounts, config)
+            token_decimals_res = get_decimals_with_retries(config.nodes, token, retries=3, proxies=config.proxies)
+            if isinstance(token_decimals_res, Err):
+                fatal(f"Failed to get decimals for token {token}: {token_decimals_res.unwrap_err()}")
+            token_decimals = token_decimals_res.unwrap()
+            result[token] = _get_token_balances(token, token_decimals, config.accounts, config)
+            result[token + "_decimals"] = token_decimals
             result[token + "_sum"] = sum([v for v in result[token].values() if v is not None])
 
     print_json(result)
 
 
-def _get_token_balances(token: str, accounts: list[str], config: Config) -> dict[str, int | None]:
+def _get_token_balances(token: str, token_decimals: int, accounts: list[str], config: Config) -> dict[str, Decimal | None]:
     result = {}
     for account in accounts:
-        result[account] = get_token_balance_with_retries(
-            nodes=config.nodes,
-            owner_address=account,
-            token_mint_address=token,
-            retries=3,
-            proxies=config.proxies,
-        ).ok_or_none()
+        result[account] = (
+            get_token_balance_with_retries(
+                nodes=config.nodes,
+                owner_address=account,
+                token_mint_address=token,
+                retries=3,
+                proxies=config.proxies,
+            )
+            .map(lambda v: mm_sol.converters.to_token(v, token_decimals))
+            .unwrap_or(None)
+        )
     return result
 
 

mm_sol/cli/cmd/wallet/mnemonic_cmd.py

@@ -6,10 +6,10 @@ from mm_std import print_json
 from mm_sol.account import derive_accounts, generate_mnemonic
 
 
-def run(mnemonic: str, passphrase: str, derivation_path: str, limit: int) -> None:  # nosec
+def run(mnemonic: str, passphrase: str, words: int, derivation_path: str, limit: int) -> None:  # nosec
     result: dict[str, Any] = {}
     if not mnemonic:
-        mnemonic = generate_mnemonic()
+        mnemonic = generate_mnemonic(words)
     result["mnemonic"] = mnemonic
     if passphrase:
         result["passphrase"] = passphrase

mm_sol/cli/examples/balances.toml

@@ -7,3 +7,4 @@ tokens = """
 65FKbLPtrssmc8aVn9DEBY8VTGB85vsgadrmaW9H4nEB
 """
 nodes = "https://api.mainnet-beta.solana.com"
+# proxies = "env_url: MM_SOL_PROXIES_URL"

mm_sol/converters.py

@@ -2,10 +2,14 @@ from decimal import Decimal
 
 
 def lamports_to_sol(lamports: int, ndigits: int = 4) -> Decimal:
+    if lamports == 0:
+        return Decimal(0)
     return Decimal(str(round(lamports / 10**9, ndigits=ndigits)))
 
 
 def to_token(smallest_unit_value: int, decimals: int, ndigits: int = 4) -> Decimal:
+    if smallest_unit_value == 0:
+        return Decimal(0)
     return Decimal(str(round(smallest_unit_value / 10**decimals, ndigits=ndigits)))
 
 

{mm_sol-0.3.2.dist-info → mm_sol-0.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mm-sol
-Version: 0.3.2
+Version: 0.3.4
 Requires-Python: >=3.12
 Requires-Dist: base58~=2.1.1
 Requires-Dist: jinja2>=3.1.5

{mm_sol-0.3.2.dist-info → mm_sol-0.3.4.dist-info}/RECORD

@@ -3,7 +3,7 @@ mm_sol/account.py,sha256=0pjvNxwhpmDHoXY3oTY2fNlQHoWPmlS77r8JcP8lAy4,4545
 mm_sol/balance.py,sha256=Idx7h9yhRLbrIEDFCBI5QSHE7OT2pYWEZrbHj9XFrkM,3147
 mm_sol/block.py,sha256=4Lc4TANgpGvPflVumC9MR-3vIl1dedGyci3cgzczuds,1794
 mm_sol/constants.py,sha256=WSpfz5_cq_8XbIrNFJGu9okwbfPTL00zsyR_k9-7O0o,29
-mm_sol/converters.py,sha256=CevrVjQHkAbtllrig8_-hU0go0YlOkWa8YebxUpqXJk,1323
+mm_sol/converters.py,sha256=rBxe3SIADZS8hG7TYl4FgjmvKH-ykaTmNbnWWQDiFZ4,1430
 mm_sol/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_sol/rpc.py,sha256=TspD_KZQp_KJDQzRknxaT8DR03okok26UWDQWF7Zflg,8031
 mm_sol/solana_cli.py,sha256=ig3OoTvmkrl7MFQSZjRHIraLSmtse0_9kn5Nsw8_zb0,8258
@@ -12,23 +12,23 @@ mm_sol/transfer.py,sha256=Gu6UYEjY5OECSusKJO-VA8C3B7W6ZJGjegUv67EQdfs,5809
 mm_sol/utils.py,sha256=NE0G564GiT9d7rW_lPPxUb1eq62WiXh28xtvtzNQIqw,556
 mm_sol/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_sol/cli/calcs.py,sha256=-r9RlsQyOziTDf84uIsvTgZmsUdNrVeazu3vTj9hhNA,1887
-mm_sol/cli/cli.py,sha256=Au_NjmvvX4A482nBP-b95tlARWEvqjTIo2CYIx0vyok,4854
+mm_sol/cli/cli.py,sha256=OlgBas-dWWZJ_WCbHJGLX6GxfILvIy7Q0VhgRo_nytE,4945
 mm_sol/cli/cli_utils.py,sha256=Skj0SCHPWMHGr2ag-em1JtIK9Qdh7xeJafMzvCgChnc,2254
 mm_sol/cli/validators.py,sha256=HLCFRrBOdyAMj_ibdAkkP36y9Zm2Dt3gMKoyPOcaiQE,1164
 mm_sol/cli/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_sol/cli/cmd/balance_cmd.py,sha256=DfUZY3-Hr-F7Y0xp1faol0yLnPu6iDU3b839VhdwAbw,2587
-mm_sol/cli/cmd/balances_cmd.py,sha256=mLKulZnmWGixzbzYYvb4dUvJcNPKFHnNyk3WnuAmKio,2215
+mm_sol/cli/cmd/balances_cmd.py,sha256=AMeO8vESO7ytQ-clChl4mRfaBiRBAiFAV_DWuv5Kn0c,2840
 mm_sol/cli/cmd/example_cmd.py,sha256=M5dvRg9jvpVUwxvMRiRnO77aKR7c57bMY9booxMAswM,222
 mm_sol/cli/cmd/node_cmd.py,sha256=2AEAjq2M9f8-RZiI0rif6wITdns9QUb4Kr34QPsI2CA,238
 mm_sol/cli/cmd/transfer_sol_cmd.py,sha256=ZBdkb7YrR88foT3zobMZGnDYAHWgx8ljkxRKpkWyM0w,5313
 mm_sol/cli/cmd/transfer_token_cmd.py,sha256=NCaSdO-eud-ef7SdWyTwWdSLiBegYAHySvKz22_j1cg,5911
 mm_sol/cli/cmd/wallet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_sol/cli/cmd/wallet/keypair_cmd.py,sha256=cRHVVTs9zNYmUozZ8ZlJoutn9V6r8I1AEHBrszR7dTE,538
-mm_sol/cli/cmd/wallet/mnemonic_cmd.py,sha256=dw6KmgNGYl2pW0JTCNri4pj-GJ3BdOia6Ef37prJydU,631
-mm_sol/cli/examples/balances.toml,sha256=8WvnKD1yUz51K1Rd3kkDQI5uOmRwE7DH8paibI-i1uM,262
+mm_sol/cli/cmd/wallet/mnemonic_cmd.py,sha256=IiON_fJT5AFfIr_E1LR6_iDYZ3c_jWCFc-wSYqk61V8,648
+mm_sol/cli/examples/balances.toml,sha256=1PWtcYyfBsaHeMsQNiNqnoiYyXMescfOrl80FGKp25o,303
 mm_sol/cli/examples/transfer-sol.toml,sha256=1LdkhSBC0y5oMJXjm8MVIMyZruIrYSIm3LBDGmcS5Iw,353
 mm_sol/cli/examples/transfer-token.toml,sha256=I_Wof-APv-h6xeYVq0zbWfLbpDny2kz9U0xJifVNEtU,401
-mm_sol-0.3.2.dist-info/METADATA,sha256=K4DNT0cuwNpzt-AqiVtbW--s9-l5s0EQtaLCWfORNAU,259
-mm_sol-0.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_sol-0.3.2.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
-mm_sol-0.3.2.dist-info/RECORD,,
+mm_sol-0.3.4.dist-info/METADATA,sha256=eQsce4amDDYDbgPehfMLKVaBkGXdXUY7LIhnwC1pu4Q,259
+mm_sol-0.3.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_sol-0.3.4.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
+mm_sol-0.3.4.dist-info/RECORD,,