mm-sol 0.7.0__py3-none-any.whl → 0.7.2__py3-none-any.whl

mm_sol/cli/calcs.py

@@ -1,6 +1,6 @@
-from mm_cryptocurrency import Nodes, Proxies
-from mm_cryptocurrency.calcs import calc_expression_with_vars
 from mm_result import Result
+from mm_web3 import Nodes, Proxies
+from mm_web3.calcs import calc_expression_with_vars
 
 from mm_sol import retry
 from mm_sol.constants import UNIT_DECIMALS

mm_sol/cli/cli_utils.py

@@ -4,7 +4,7 @@ from pathlib import Path
 
 import mm_print
 from loguru import logger
-from mm_cryptocurrency import CryptocurrencyConfig, Nodes, Proxies, random_node, random_proxy
+from mm_web3 import Nodes, Proxies, Web3CliConfig, random_node, random_proxy
 from pydantic import BaseModel
 from solders.signature import Signature
 
@@ -20,7 +20,7 @@ class BaseConfigParams(BaseModel):
     print_config_and_exit: bool
 
 
-def print_config(config: CryptocurrencyConfig, exclude: set[str] | None = None, count: set[str] | None = None) -> None:
+def print_config(config: Web3CliConfig, exclude: set[str] | None = None, count: set[str] | None = None) -> None:
     data = config.model_dump(exclude=exclude)
     if count:
         for k in count:

mm_sol/cli/cmd/balance_cmd.py

@@ -1,7 +1,7 @@
 from decimal import Decimal
 
 import mm_print
-from mm_cryptocurrency import fetch_proxies
+from mm_web3 import fetch_proxies
 from pydantic import BaseModel, Field
 
 import mm_sol.retry

mm_sol/cli/cmd/balances_cmd.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from typing import Annotated, Any
 
 import mm_print
-from mm_cryptocurrency import ConfigValidators, CryptocurrencyConfig
+from mm_web3 import ConfigValidators, Web3CliConfig
 from pydantic import BeforeValidator, Field
 
 import mm_sol.retry
@@ -12,7 +12,7 @@ from mm_sol import converters, retry
 from mm_sol.cli.validators import Validators
 
 
-class Config(CryptocurrencyConfig):
+class Config(Web3CliConfig):
     accounts: Annotated[list[str], BeforeValidator(Validators.sol_addresses(unique=True))]
     tokens: Annotated[list[str], BeforeValidator(Validators.sol_addresses(unique=True))]
     nodes: Annotated[list[str], BeforeValidator(ConfigValidators.nodes())]

mm_sol/cli/cmd/transfer_cmd.py

@@ -5,12 +5,12 @@ from typing import Annotated
 
 import mm_print
 from loguru import logger
-from mm_cryptocurrency import CryptocurrencyConfig
-from mm_cryptocurrency.account import PrivateKeyMap
-from mm_cryptocurrency.calcs import calc_decimal_expression
-from mm_cryptocurrency.log import init_loguru
-from mm_cryptocurrency.validators import Transfer
 from mm_std import utc_now
+from mm_web3 import Web3CliConfig
+from mm_web3.account import PrivateKeyMap
+from mm_web3.calcs import calc_decimal_expression
+from mm_web3.log import init_loguru
+from mm_web3.validators import Transfer
 from pydantic import AfterValidator, BeforeValidator, Field, model_validator
 from rich.console import Console
 from rich.live import Live
@@ -25,7 +25,7 @@ from mm_sol.cli.validators import Validators
 from mm_sol.converters import lamports_to_sol, to_token
 
 
-class Config(CryptocurrencyConfig):
+class Config(Web3CliConfig):
     nodes: Annotated[list[str], BeforeValidator(Validators.nodes())]
     transfers: Annotated[list[Transfer], BeforeValidator(Validators.sol_transfers())]
     private_keys: Annotated[PrivateKeyMap, BeforeValidator(Validators.sol_private_keys())]

mm_sol/cli/examples/balances.toml

@@ -9,4 +9,4 @@ JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN # JUP
 """
 
 nodes = "https://api.mainnet-beta.solana.com"
-# proxies = "env_url: MM_SOL_PROXIES_URL"
+# proxies = "env_url: MM_SOL_PROXIES_URL"

mm_sol/cli/examples/transfer.toml

@@ -3,7 +3,7 @@
 # value is an expression that can contain variable 'balance' and 'random' function
 transfers = """
 # for sol transfer use 'sol' suffix, example: 1.2sol. For other tokens use 't' suffix, example: 1.2t
-Bd8CxCTLez2ckVTqEJjuZkWjYFSRbo8fA1qYbd7yFVP9 Eaft9xXzfgbRqsHd65WspoaxTtH7pkznM9YA8tsDKGwj 1.2t 
+Bd8CxCTLez2ckVTqEJjuZkWjYFSRbo8fA1qYbd7yFVP9 Eaft9xXzfgbRqsHd65WspoaxTtH7pkznM9YA8tsDKGwj 1.2t
 Fc2TRJVCpFZpRz56mFnQETctib1zwFnwHcS7HoQSgUzZ EVJctTWikt29rUXBf49tyQdK87x837HtvpCwqeSjp1Ur 0.6balance-random(1t,2.50t)-100
 6TW4WswDgGmEB5HELBtEdwC1tQJq9Xa1msDjPw94sgai GGb7gb5EzW8GZZWX552eiC9r1SY4Pqtgbqf9UMrBrEzy # default_value will be used
 file: /path/to/other/transfers.txt # transfers from this file will be added

mm_sol/cli/validators.py

@@ -1,8 +1,8 @@
 from collections.abc import Callable
 
-from mm_cryptocurrency import ConfigValidators
-from mm_cryptocurrency.account import PrivateKeyMap
-from mm_cryptocurrency.validators import Transfer
+from mm_web3 import ConfigValidators
+from mm_web3.account import PrivateKeyMap
+from mm_web3.validators import Transfer
 
 from mm_sol.account import get_public_key, is_address
 from mm_sol.constants import UNIT_DECIMALS

mm_sol/retry.py

@@ -1,5 +1,5 @@
-from mm_cryptocurrency import Nodes, Proxies, retry_with_node_and_proxy
 from mm_result import Result
+from mm_web3 import Nodes, Proxies, retry_with_node_and_proxy
 from solders.solders import Pubkey, Signature
 
 from mm_sol import rpc, spl_token, transfer

{mm_sol-0.7.0.dist-info → mm_sol-0.7.2.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: mm-sol
-Version: 0.7.0
+Version: 0.7.2
 Requires-Python: >=3.13
 Requires-Dist: base58~=2.1.1
 Requires-Dist: jinja2>=3.1.6
-Requires-Dist: mm-cryptocurrency~=0.4.7
+Requires-Dist: mm-web3~=0.5.2
 Requires-Dist: mnemonic==0.21
 Requires-Dist: socksio>=1.0.0
-Requires-Dist: solana~=0.36.7
-Requires-Dist: typer>=0.16.0
+Requires-Dist: solana~=0.36.9
+Requires-Dist: typer>=0.16.1

{mm_sol-0.7.0.dist-info → mm_sol-0.7.2.dist-info}/RECORD

@@ -3,29 +3,29 @@ mm_sol/account.py,sha256=cVcxRQBuV_Gfm2WgQIwaYuAQijeIJqDDxLC22PN0XSs,3493
 mm_sol/constants.py,sha256=9XKF8Z2dyY6L82_Bm0_naSQp5U0mIaOeqbZNBj25D2E,27
 mm_sol/converters.py,sha256=rBxe3SIADZS8hG7TYl4FgjmvKH-ykaTmNbnWWQDiFZ4,1430
 mm_sol/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_sol/retry.py,sha256=65VeibEB1FGJXVPzcGwIVK9UcbtIsnEhdmIWMhZAaxU,2899
+mm_sol/retry.py,sha256=IjaKvIe13_kRkwUxEpgNaZ0MNAW9bSOW5H33BL8GNA4,2889
 mm_sol/rpc.py,sha256=c5AtHygQD5xawqfrrqByNtdGsEAq3mFfC17sdM3y4lU,2478
 mm_sol/rpc_sync.py,sha256=bHK5vUramNxgA0v5BwSFNpzpiyKWSeBUW6Bu8tXV9W8,7195
 mm_sol/spl_token.py,sha256=Bd5zXhlVhFd5n3WwunRoeM_yYo-0f1hNR7_1zww81A8,1944
 mm_sol/transfer.py,sha256=kfNGRjF4aNSLAyBdm0jHyCXENFTMwib4pqIhKRJGCCQ,4413
 mm_sol/utils.py,sha256=oD06NsMSMhN6lqsM6mSgLTtiKwA1uAsen9WR82ofRTE,923
 mm_sol/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_sol/cli/calcs.py,sha256=7t5iFWVQbZiObsEx_DgBc8E9PlS39fge_N1R_8OJEEk,1785
+mm_sol/cli/calcs.py,sha256=lgXF5SJkwOEY2AjygBO9CxP-LpyvOWB7j5HQn6p-1tU,1765
 mm_sol/cli/cli.py,sha256=TxAAQ-QX9j9mG6d6el9SLYxF3QeIeWal7AdW_GTzPZQ,4723
-mm_sol/cli/cli_utils.py,sha256=1Tg7jwFfYn9he-QS2vGBl9-MXwBRJRb1Xsjw004z1Iw,1823
-mm_sol/cli/validators.py,sha256=LtclH-fatMxYRC9v8v0f9HHTDV708TWseBgDEXPllg0,1431
+mm_sol/cli/cli_utils.py,sha256=1_ikUjwHkxJleNwhVLaI_-6m4JyCKZFH2WgvsZ5EGMk,1799
+mm_sol/cli/validators.py,sha256=DnK2C68MgceqQ6Zs90WZ6Co0LYMiNmhxZILX-2GKhZM,1401
 mm_sol/cli/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_sol/cli/cmd/balance_cmd.py,sha256=-GPBjs9PWdHUcNxV_CKpmns7kJUykeqeNcSbIrO6aoU,2462
-mm_sol/cli/cmd/balances_cmd.py,sha256=ROI6ozTNP3o4CVQ9Bsg9TqYw6QJp3DuWDLJ6eoHhl6A,2687
+mm_sol/cli/cmd/balance_cmd.py,sha256=6h7ryybMyegy8EsV1limWo2gcYL9_dczK9JRiHxHLzg,2452
+mm_sol/cli/cmd/balances_cmd.py,sha256=bAhr12LqElreonb46_sooRqjeDs2iM_VGNZHLg0VgYQ,2663
 mm_sol/cli/cmd/example_cmd.py,sha256=r_fBZyFHAs6OTHT7HnE18bh_SKz-ABrcX6_nytJyJDY,214
 mm_sol/cli/cmd/node_cmd.py,sha256=octbG9IwCUKyaFgGrPf_2MJlzHKncMQhGlyi-1rqw-E,339
-mm_sol/cli/cmd/transfer_cmd.py,sha256=Uk9dT__j0XoCMucFQuMw2e8OCkdR4GJGdLygq1926qM,11077
+mm_sol/cli/cmd/transfer_cmd.py,sha256=1Lbo1uKN3NeDuJrPQRJ77hEZI5TgguIQua5elmSNkYY,11013
 mm_sol/cli/cmd/wallet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_sol/cli/cmd/wallet/keypair_cmd.py,sha256=HndbANn2XbuHWxD-8ggKEGUK1OT1tjiVTtR5G6F8XFw,527
 mm_sol/cli/cmd/wallet/mnemonic_cmd.py,sha256=xT0wzBtj9IeJHvrzst0jFjXP4pj_k17JsKX_PBNjIO4,637
-mm_sol/cli/examples/balances.toml,sha256=333g2EkyYBDW7OWFGMIWVZGkdFQMMo0Ag-bg-BvS4Zg,349
-mm_sol/cli/examples/transfer.toml,sha256=kOCdmuwmhlOam4LVtlcYTKF0PoZYHWMlv9gWxNSXMOk,1624
-mm_sol-0.7.0.dist-info/METADATA,sha256=F33DL_8KIot3m93mLdCGyV8qDdbGaEh9M-GbXS5HVsw,291
-mm_sol-0.7.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_sol-0.7.0.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
-mm_sol-0.7.0.dist-info/RECORD,,
+mm_sol/cli/examples/balances.toml,sha256=UxX5FXKhH1lwjniiOQW-hZP0C731W96o5-1V1yqg0cQ,350
+mm_sol/cli/examples/transfer.toml,sha256=-7inhWntAHKYqr0spmRYyNflUrYWscv_xMoWwytS61E,1623
+mm_sol-0.7.2.dist-info/METADATA,sha256=fWKdxBD_qzkzcD0mpKk30gN9kmg01XqUq5q_c-QdfEs,281
+mm_sol-0.7.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_sol-0.7.2.dist-info/entry_points.txt,sha256=MrYnosumy9nsITSAw5TiR3WXDwsdoF0YvUIlZ38TLLs,46
+mm_sol-0.7.2.dist-info/RECORD,,