mm-eth 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

mm_eth/account.py

@@ -39,9 +39,7 @@ def generate_accounts(  # nosec
     for i in range(limit):
         path = f"{path_prefix}/{i}"
         acc = Account.from_mnemonic(mnemonic=mnemonic, account_path=path, passphrase=passphrase)
-        private_key = acc.key.hex().lower()
-        if not private_key.startswith("0x"):
-            private_key = f"0x{private_key}"
+        private_key = acc.key.to_0x_hex().lower()
         result.append(NewAccount(path, acc.address, private_key))
     return result
 

mm_eth/cli/cli_utils.py

@@ -11,7 +11,7 @@ from mm_eth.account import is_private_key
 
 
 def get_version() -> str:
-    return importlib.metadata.version("mm-eth-cli")
+    return importlib.metadata.version("mm-eth")
 
 
 def public_rpc_url(url: str | None) -> str:
@@ -23,6 +23,10 @@ def public_rpc_url(url: str | None) -> str:
     match url.lower():
         case "opbnb" | "204":
             return "https://opbnb-mainnet-rpc.bnbchain.org"
+        case "base" | "8453":
+            return "https://mainnet.base.org"
+        case "base-sepolia" | "84532":
+            return "https://sepolia.base.org"
         case _:
             return url
 

mm_eth/cli/cmd/balances_cmd.py

@@ -17,12 +17,10 @@ class Config(BaseConfig):
     round_ndigits: int = 5
 
     @field_validator("nodes", mode="before")
-    @classmethod
     def nodes_validator(cls, v: str | list[str] | None) -> list[str]:
         return validators.nodes_validator(v)
 
     @field_validator("tokens", "addresses", mode="before")
-    @classmethod
     def addresses_validator(cls, v: str | list[str] | None) -> list[str]:
         return validators.addresses_validator(v)
 

mm_eth/cli/cmd/send_contract_cmd.py

@@ -35,22 +35,18 @@ class Config(BaseConfig):
     log_info: str | None = None
 
     @field_validator("log_debug", "log_info", mode="before")
-    @classmethod
     def log_validator(cls, v: str | None) -> str | None:
         return validators.log_validator(v)
 
     @field_validator("nodes", "from_addresses", mode="before")
-    @classmethod
     def list_validator(cls, v: str | list[str] | None) -> list[str]:
         return validators.nodes_validator(v)
 
     @field_validator("from_addresses", mode="before")
-    @classmethod
     def from_addresses_validator(cls, v: str | list[str] | None) -> list[str]:
         return str_to_list(v, remove_comments=True, lower=True)
 
     @field_validator("private_keys", mode="before")
-    @classmethod
     def private_keys_validator(cls, v: str | list[str] | None) -> dict[str, str]:
         if v is None:
             return {}

mm_eth/cli/cmd/transfer_erc20_cmd.py

@@ -44,17 +44,14 @@ class Config(BaseConfig):
         return [tx.from_address for tx in self.txs]
 
     @field_validator("log_debug", "log_info", mode="before")
-    @classmethod
     def log_validator(cls, v: str | None) -> str | None:
         return validators.log_validator(v)
 
     @field_validator("nodes", mode="before")
-    @classmethod
     def nodes_validator(cls, v: str | list[str] | None) -> list[str]:
         return validators.nodes_validator(v)
 
     @field_validator("private_keys", mode="before")
-    @classmethod
     def private_keys_validator(cls, v: str | list[str] | None) -> dict[str, str]:
         if v is None:
             return {}

mm_eth/cli/cmd/transfer_eth_cmd.py

@@ -43,17 +43,14 @@ class Config(BaseConfig):
         return [tx.from_address for tx in self.txs]
 
     @field_validator("log_debug", "log_info", mode="before")
-    @classmethod
     def log_validator(cls, v: str | None) -> str | None:
         return validators.log_validator(v)
 
     @field_validator("nodes", mode="before")
-    @classmethod
     def nodes_validator(cls, v: str | list[str] | None) -> list[str]:
         return validators.nodes_validator(v)
 
     @field_validator("private_keys", mode="before")
-    @classmethod
     def private_keys_validator(cls, v: str | list[str] | None) -> dict[str, str]:
         if v is None:
             return {}

mm_eth/erc20.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import string
+from collections.abc import Sequence
 from dataclasses import dataclass
-from typing import TYPE_CHECKING
 
 import eth_abi
 import eth_utils
@@ -11,15 +11,11 @@ from eth_utils import to_checksum_address, to_hex
 from mm_std import Err, Ok, Result
 
 from mm_eth import rpc
+from mm_eth.rpc import Log
 from mm_eth.tx import SignedTx, sign_legacy_tx, sign_tx
+from mm_eth.types import Nodes, Proxies
 from mm_eth.utils import hex_str_to_int, hex_to_bytes, log_topic_to_address
 
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
-    from mm_eth.rpc import Log
-    from mm_eth.types import Nodes, Proxies
-
 TRANSFER_METHOD = "0xa9059cbb"
 TRANSFER_TOPIC = HexStr("0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef")
 

mm_eth/rpc.py

@@ -2,19 +2,16 @@ from __future__ import annotations
 
 import json
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Literal, cast
+from typing import Any, Literal, cast
 
 import websocket
 from mm_std import Err, Ok, Result, hr, random_choice
 from pydantic import BaseModel
+from web3.types import BlockIdentifier
 
+from mm_eth.types import Nodes, Proxies
 from mm_eth.utils import hex_str_to_int, random_node, random_proxy
 
-if TYPE_CHECKING:
-    from web3.types import BlockIdentifier
-
-    from mm_eth.types import Nodes, Proxies
-
 
 @dataclass
 class TxReceipt:

mm_eth/tx.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from typing import Any
 
 import rlp
+from eth_account import Account
 from eth_utils import keccak, to_hex
 from pydantic import BaseModel
 from rlp.sedes import Binary, big_endian_int, binary
@@ -133,8 +134,8 @@ def sign_tx(
     if to:
         tx["to"] = Web3.to_checksum_address(to)
 
-    signed = w3.eth.account.sign_transaction(tx, private_key)
-    return SignedTx(tx_hash=signed.hash.hex(), raw_tx=signed.raw_transaction.hex())
+    signed = Account.sign_transaction(tx, private_key)
+    return SignedTx(tx_hash=signed.hash.to_0x_hex(), raw_tx=signed.raw_transaction.to_0x_hex())
 
 
 def decode_raw_tx(raw_tx: str) -> DecodedRawTx:

{mm_eth-0.2.3.dist-info → mm_eth-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mm-eth
-Version: 0.2.3
+Version: 0.2.5
 Requires-Python: >=3.12
 Requires-Dist: loguru~=0.7.3
 Requires-Dist: mm-std~=0.1.12

{mm_eth-0.2.3.dist-info → mm_eth-0.2.5.dist-info}/RECORD

@@ -1,28 +1,28 @@
 mm_eth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_eth/abi.py,sha256=Qf-QOsR9QexyQM9XWKNeTMkRarIL3XQJbaDbJ8ifMrw,4856
-mm_eth/account.py,sha256=IsajQ7156-CxqRFt2ntv_3nJKwi6tCZz0TmtjUCgmIg,2038
+mm_eth/account.py,sha256=iqAlSpqnSvZvj3cdosmpmheuObHOpedE8wNYWxXdkV4,1954
 mm_eth/anvil.py,sha256=98RCfI7dEpxFBTV6UErYvubWVP3n0ctUFn1--4kZ84U,1603
 mm_eth/deploy.py,sha256=SB3ruY808_5UnG8kHR34uVP66P3zOWZu0ImKD7UUv2s,691
 mm_eth/ens.py,sha256=WMxqC1v3zwDDuLH_oWekm22qrNYxCNcvZumQMT7SYds,623
-mm_eth/erc20.py,sha256=m0_yYzPYgOBx0oh4V330XGjRQBjMd5XlWhRL5qChvQE,6866
+mm_eth/erc20.py,sha256=2IV7Ha_jDFTUh_rMncibl4CMdCZhq_rU4LzYOwBpiVQ,6801
 mm_eth/ethernodes.py,sha256=9y_poTmFUj6cnWaT9mtfc6S9lAfVXTwLGRqxMQ8hT0Y,3080
 mm_eth/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_eth/rpc.py,sha256=F0jBzYw4wkh9LKwynXrzyhA08r5JTGrYAbwTH6C2Z7w,13872
+mm_eth/rpc.py,sha256=u84VWM--tLEzfNtfW0jCzDnkd54KDbFmegN1IFwsw0g,13829
 mm_eth/solc.py,sha256=dYRvT8PjZlLDZhNsc_-0790Eug_ZwU2G-iBfIdGj6wQ,1071
-mm_eth/tx.py,sha256=J5Wky8rmV6NlMFmAYF4997PscRYlUdkYFpEldH3BCNg,4014
+mm_eth/tx.py,sha256=efSoMCoWkenbGdHo1_LX66_Edz1HvED5-J_i3wrHwMw,4051
 mm_eth/types.py,sha256=vXXP5Dc72BpHv5tsyws0KDZebG1W1-5HH0UjL7N2Mgc,113
 mm_eth/utils.py,sha256=NICgROKU5ZTrkY6nlSDLHjbbpYYswLoofyc3ozPdwBs,7804
 mm_eth/vault.py,sha256=h8NyiOQh5YFskh1lZA3KyvnJUnxl9769ME2ChplG0CM,1477
 mm_eth/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_eth/cli/calcs.py,sha256=yDx3VgFmCLRYWpZVqyk_-mXIgTVFDPKGTktx-7H2XDw,4426
 mm_eth/cli/cli.py,sha256=FfEgosWXa9gIGRuwSbPILvaDQ2Crh9hqTU50CqatvgY,8956
-mm_eth/cli/cli_utils.py,sha256=jkw2hDzR2hrYKmY8egR4RicLHe4RFjC7yhShtA0HzhQ,3682
+mm_eth/cli/cli_utils.py,sha256=DMSb6bS0OKVDWyYVB8kdsD5H9KOIyUWdR6KK1f_2e9U,3839
 mm_eth/cli/print_helpers.py,sha256=yOiOFjTKloumwf07AqNIHQswUo8t0yuT9bpeGBGl60Q,1470
 mm_eth/cli/rpc_helpers.py,sha256=tAJBUHwpH0jPvg0Hrm-cwpOrpp9GUb91e4ZdwixNUQg,4723
 mm_eth/cli/validators.py,sha256=CWOXorI2HGajhLvQ354d2cCl5S3JC7tKUxWmmVn6j4Y,2417
 mm_eth/cli/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_eth/cli/cmd/balance_cmd.py,sha256=SjRSbGF8QFMBHncEyzPdVUi_rjOwNW2wxfbFsRBV2A0,2097
-mm_eth/cli/cmd/balances_cmd.py,sha256=WIB9jhQP0Uut-JQ5H4gVouOxtUvQkqwobaidu4OvE60,4248
+mm_eth/cli/cmd/balances_cmd.py,sha256=3kxgHBmMDbzt0E7iaNaVaP_YaQArttlHaOfnB2usez8,4214
 mm_eth/cli/cmd/call_contract_cmd.py,sha256=T6IHzxHuymJsEog2y7oMKNiHahip_W3FIk0adH4T0W4,1170
 mm_eth/cli/cmd/config_example_cmd.py,sha256=hMfrFxjIP0xZllJRRxi99qhF8tzJI3lrp-XudFEWF1g,270
 mm_eth/cli/cmd/deploy_cmd.py,sha256=nFJExEcKbm-6pE-r-XDY6pExOJywSSK7fN_gMZs9hc4,1173
@@ -31,17 +31,17 @@ mm_eth/cli/cmd/mnemonic_cmd.py,sha256=Mb0H0inSNCa93GEPxGYQi7BnPe11mnLjnspfe7h54I
 mm_eth/cli/cmd/node_cmd.py,sha256=mUqixPGNHzuKCJvk1Fd5VaUGumpbR2AE7raGmXZscg4,1943
 mm_eth/cli/cmd/private_key_cmd.py,sha256=Fv_2OLog1h32pIP7PJITwl_pHdy3BXvaDRcXZsxY1xo,241
 mm_eth/cli/cmd/rpc_cmd.py,sha256=02q82YqgbPezfEBmV_QBCIeNReE7ktkPych8Xr9ann8,2186
-mm_eth/cli/cmd/send_contract_cmd.py,sha256=53MRNTWA4tMqMRwt_VUziR1W1m97fYhiBrvELreYraM,9091
+mm_eth/cli/cmd/send_contract_cmd.py,sha256=cGVP1hZOp64e5rN5uCsA2QkG5NIN9Car_2IZDWh4RvA,9023
 mm_eth/cli/cmd/solc_cmd.py,sha256=tBpeMdPfGs2iQIMaIJAAhMh1a3KyXHwyninfXPVpsgs,677
 mm_eth/cli/cmd/token_cmd.py,sha256=4y6ZQpLOJ33_iNuKpm9tZXh4RntWhmPUcizgaNNBzaw,1102
-mm_eth/cli/cmd/transfer_erc20_cmd.py,sha256=8IfLuqXV5OnPByrj3MTAsjyYn95X9f8IPKk0wHHcSPw,10246
-mm_eth/cli/cmd/transfer_eth_cmd.py,sha256=_nX_iCg6XPa8xjM1EwjE2CX-iDLj2vx0jNVXYq3UlzI,9420
+mm_eth/cli/cmd/transfer_erc20_cmd.py,sha256=fNja8Krx5OLzEvZypt1d5CogrN9BsLHVG48DI1W0twM,10195
+mm_eth/cli/cmd/transfer_eth_cmd.py,sha256=_LgSGaFD0GbzODA3OfIUXjKGFSNBHltNM0fcgDbnEN8,9369
 mm_eth/cli/cmd/vault_cmd.py,sha256=rRTclz0U6N_87KFsssdvZhi3_f6tmkHiYxMsIoVeBGc,532
 mm_eth/cli/config_examples/balances.yml,sha256=fpXJfoOSqOrkoWpqO7-HrTTb5OBs9PM-PpZ1ulqWUnY,399
 mm_eth/cli/config_examples/call_contract.yml,sha256=E0XuWuBnbhyTYfxNqaoxH6Cy7UCYqMLDwoEu_4OSV3M,233
 mm_eth/cli/config_examples/transfer_erc20.yml,sha256=mCUpUfqzZjTvst8kqd3EGzJY0S7cr48ySqS6yZhzLdI,1324
 mm_eth/cli/config_examples/transfer_eth.yml,sha256=i4hh3-LTcpl7JsrSuuM6gDi23B5ZnCeEnaYazQO3bzQ,1181
-mm_eth-0.2.3.dist-info/METADATA,sha256=8FzuizpFSQqE8u73z4BDoTMQlE2S6cSxEj-iUyI_d_Q,228
-mm_eth-0.2.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_eth-0.2.3.dist-info/entry_points.txt,sha256=aGhpsozl8NIrkuUcX5fSgURCcDhr3ShUdeTSIrJq4oc,46
-mm_eth-0.2.3.dist-info/RECORD,,
+mm_eth-0.2.5.dist-info/METADATA,sha256=Mr7RQIAKsxfuTeNonQ-cNMoQhKebpPp0dkRsPZ54zyE,228
+mm_eth-0.2.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_eth-0.2.5.dist-info/entry_points.txt,sha256=aGhpsozl8NIrkuUcX5fSgURCcDhr3ShUdeTSIrJq4oc,46
+mm_eth-0.2.5.dist-info/RECORD,,