mm-eth 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

mm_eth/abi.py

@@ -6,11 +6,10 @@ from typing import Any, cast
 import eth_abi
 import eth_utils
 import pydash
-from eth_typing import HexStr
+from eth_typing import ABI, ABIFunction, HexStr
 from pydantic import BaseModel
 from web3 import Web3
 from web3.auto import w3
-from web3.types import ABI, ABIFunction
 
 from mm_eth.utils import hex_to_bytes
 
@@ -85,7 +84,7 @@ def encode_function_input_by_abi(abi: ABI | ABIFunction, fn_name: str, args: lis
         else:
             processed_args.append(args[idx])
 
-    return Web3().eth.contract(abi=[abi]).encodeABI(fn_name=fn_name, args=processed_args)  # type: ignore[no-any-return]
+    return Web3().eth.contract(abi=[abi]).encode_abi(abi_element_identifier=fn_name, args=processed_args)  # type: ignore[no-any-return]
 
 
 def encode_function_input_by_signature(func_signature: str, args: list[Any]) -> HexStr:
@@ -100,7 +99,7 @@ def encode_function_input_by_signature(func_signature: str, args: list[Any]) ->
     func_abi: ABIFunction = {
         "name": func_name,
         "type": "function",
-        "inputs": [{"type": t} for t in arg_types],
+        "inputs": [{"type": t} for t in arg_types],  # type: ignore[typeddict-item]
     }
     return encode_function_input_by_abi(func_abi, func_name, args)
 
@@ -123,8 +122,8 @@ def parse_function_signatures(contract_abi: ABI) -> dict[str, str]:
     result: dict[str, str] = {}
     for item in contract_abi:
         if item.get("type", None) == "function":
-            function_name = item["name"]
-            types = ",".join([i["type"] for i in item["inputs"]])
+            function_name = item["name"]  # type: ignore
+            types = ",".join([i["type"] for i in item["inputs"]])  # type: ignore
             function_name_and_types = f"{function_name}({types})"
             result[function_name_and_types] = encode_function_signature(function_name_and_types)
     return result

mm_eth/account.py

@@ -7,7 +7,7 @@ from eth_keys import KeyAPI
 from eth_typing import ChecksumAddress
 from eth_utils import decode_hex
 
-Account.enable_unaudited_hdwallet_features()  # type: ignore[no-untyped-call]
+Account.enable_unaudited_hdwallet_features()
 
 key_api = KeyAPI()
 
@@ -24,7 +24,7 @@ def to_checksum_address(address: str) -> ChecksumAddress:
 
 
 def generate_mnemonic(num_words: int = 24) -> str:
-    mnemonic = Mnemonic("english")  # type: ignore[no-untyped-call]
+    mnemonic = Mnemonic("english")
     return mnemonic.generate(num_words=num_words)
 
 
@@ -38,13 +38,15 @@ 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)
-        result.append(NewAccount(path, acc.address, acc.key.hex()))
+        private_key = acc.key.hex().lower()
+        if not private_key.startswith("0x"):
+            private_key = f"0x{private_key}"
+        result.append(NewAccount(path, acc.address, private_key))
     return result
 
 
 def private_to_address(private_key: str) -> str | None:
     """returns address in lower case"""
-    # noinspection PyBroadException
     try:
         return key_api.PrivateKey(decode_hex(private_key)).public_key.to_address().lower()
     except Exception:
@@ -62,7 +64,6 @@ def create_private_keys_dict(private_keys: list[str]) -> dict[str, str]:  # addr
 
 
 def is_private_key(private_key: str) -> bool:
-    # noinspection PyBroadException
     try:
         key_api.PrivateKey(decode_hex(private_key)).public_key.to_address()
         return True

mm_eth/cli/cli.py

@@ -61,7 +61,7 @@ def token_command(
 def node_command(
     urls: Annotated[list[str], typer.Argument()],
     print_format: Annotated[PrintFormat, typer.Option("--format", "-f", help="Print format")] = PrintFormat.TABLE,
-    proxy: Annotated[str, typer.Option("--proxy", "-p", help="Proxy")] = "",
+    proxy: Annotated[str | None, typer.Option("--proxy", "-p", help="Proxy")] = None,
 ) -> None:
     node_cmd.run(urls, print_format, proxy)
 

mm_eth/tx.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from typing import Any
 
 import rlp
-from eth_utils import keccak
+from eth_utils import keccak, to_hex
 from pydantic import BaseModel
 from rlp.sedes import Binary, big_endian_int, binary
 from web3 import Web3
@@ -105,7 +105,7 @@ def sign_legacy_tx(
         tx["data"] = data
 
     signed = w3.eth.account.sign_transaction(tx, private_key)
-    return SignedTx(tx_hash=signed.hash.hex(), raw_tx=signed.rawTransaction.hex())
+    return SignedTx(tx_hash=to_hex(signed.hash), raw_tx=to_hex(signed.raw_transaction))
 
 
 def sign_tx(
@@ -136,7 +136,7 @@ def sign_tx(
         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.rawTransaction.hex())
+    return SignedTx(tx_hash=signed.hash.hex(), raw_tx=signed.raw_transaction.hex())
 
 
 def decode_raw_tx(raw_tx: str) -> DecodedRawTx:

mm_eth/utils.py

@@ -243,3 +243,7 @@ def random_node(nodes: Nodes, remove_slash: bool = True) -> str:
 
 def random_proxy(proxies: Proxies) -> str | None:
     return random_str_choice(proxies)
+
+
+def to_hex(data: bytes | int | bool) -> str:
+    return Web3.to_hex(data)

mm_eth/zksync.py

@@ -2,12 +2,12 @@ import json
 import pkgutil
 from typing import cast
 
-from eth_typing import ChecksumAddress, HexStr
+from eth_typing import ABI, ChecksumAddress, HexStr
 from hexbytes import HexBytes
 from mm_std import Err, Ok, Result
 from pydantic import BaseModel, Field
 from web3 import Web3
-from web3.types import ABI, Nonce, TxParams, Wei
+from web3.types import Nonce, TxParams, Wei
 
 from mm_eth import abi, rpc
 from mm_eth.rpc import rpc_call

mm_eth-0.1.3.dist-info/METADATA

@@ -0,0 +1,9 @@
+Metadata-Version: 2.3
+Name: mm-eth
+Version: 0.1.3
+Requires-Python: >=3.12
+Requires-Dist: loguru~=0.7.2
+Requires-Dist: mm-std~=0.1.3
+Requires-Dist: typer~=0.12.5
+Requires-Dist: web3~=7.3.0
+Requires-Dist: websocket-client~=1.8.0

{mm_eth-0.1.1.dist-info → mm_eth-0.1.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 mm_eth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_eth/abi.py,sha256=VpZETb7jh8Ovghxit-UI13cxAWP7siv5UqIzC70GIB0,4736
-mm_eth/account.py,sha256=ZpmcYRmJVa6oJMtSlLSkpjgbA8M-g6alaHQaeQT1I9Y,1982
+mm_eth/abi.py,sha256=_xw2c7Eht3-g-fA6yvakHMcehzsRRK_LqTO7Q8Ppkj4,4794
+mm_eth/account.py,sha256=McY_ceSLMs6lvB2RfDmBfH0dleuVnFh2jopszGkI4HQ,1976
 mm_eth/anvil.py,sha256=9CWXWyK7tVrvs6NeOy7QnVwMTrUke-nBMFwZeJ4VULA,1582
 mm_eth/deploy.py,sha256=SB3ruY808_5UnG8kHR34uVP66P3zOWZu0ImKD7UUv2s,691
 mm_eth/ens.py,sha256=WMxqC1v3zwDDuLH_oWekm22qrNYxCNcvZumQMT7SYds,623
@@ -9,15 +9,15 @@ mm_eth/ethernodes.py,sha256=9y_poTmFUj6cnWaT9mtfc6S9lAfVXTwLGRqxMQ8hT0Y,3080
 mm_eth/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_eth/rpc.py,sha256=kQnYllp5ZHGuIUUX2Vw-ejLwL3zXQgka3ukwDndv4AM,13881
 mm_eth/solc.py,sha256=JcBCel-LO-lBvz3_1f7s3pVhECsUittavBvXqxYIP2c,1066
-mm_eth/tx.py,sha256=XkyafbEepG5VtJwVlM2NNPuFGit8pldKdOPh_R_1iJE,4032
+mm_eth/tx.py,sha256=qSkaPgow3QEZR0vbnQouw8X4G-Hw9RedPrDB10aZhU0,4046
 mm_eth/types.py,sha256=w_B1o_XggFz2cHXa36tI-wjfE4r-BFhvKIF9nb2YI5g,154
-mm_eth/utils.py,sha256=TMvQMtP7YyuBnv-bsjbcIzRfBUyVFBI8IjeolCXXlVg,7785
+mm_eth/utils.py,sha256=kjCIsXtRTG0dL6A1bCCuWctqd0Qh8K8N-ZocQRppYj0,7861
 mm_eth/vault.py,sha256=1ahABcgyYAMUlE4ELMGdlG_uV4irmwzrfzUZTpo3rdY,1500
-mm_eth/zksync.py,sha256=XLop9r5_gVEi9tm1MUfuSl0wUmbE27m7x0pir7T3hZA,5997
+mm_eth/zksync.py,sha256=u9vnB85LXcZmtsgqsGd7NIDTwZf_U39LQfvVdC4C5I0,5997
 mm_eth/abi/zksync.json,sha256=aHp6-Y5W6wRz0hrC0aPTjAHb-Q2ipDikcAB5FtlxWWA,45503
 mm_eth/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_eth/cli/calcs.py,sha256=nHfn_Q9T_E8_hP7ExMyWlUGvAMzxQs6KgzdNg1CUnvU,3651
-mm_eth/cli/cli.py,sha256=E7cdP850ulPz_uPQe2RUWk63zrJ0SK2GvVBXdkjxZEs,8983
+mm_eth/cli/cli.py,sha256=lXLf_-oHT0JykSU_CHjVuq0f1EXPCfCq-OK_S6dgtiM,8992
 mm_eth/cli/cli_helpers.py,sha256=0NapwmrRVQ1PWDP6iqwaX1fnzrIdD_TwvcZXIcq5QzM,6572
 mm_eth/cli/cli_utils.py,sha256=4I12cJV0deKfarRpd2wNhW42L_jQab4oxa9DX-WxicM,5041
 mm_eth/cli/validators.py,sha256=bE4G-OL6W6S30P4FK5pVn_LiY2G2w8aeA3R1kQaX0gY,2379
@@ -43,8 +43,7 @@ mm_eth/cli/config_examples/call_contract.yml,sha256=E0XuWuBnbhyTYfxNqaoxH6Cy7UCY
 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/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_eth-0.1.1.dist-info/METADATA,sha256=Leq_n-4i8lyJyHThyXt8WReYRWFHitcnbA6I2Se_GPM,234
-mm_eth-0.1.1.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-mm_eth-0.1.1.dist-info/entry_points.txt,sha256=aGhpsozl8NIrkuUcX5fSgURCcDhr3ShUdeTSIrJq4oc,46
-mm_eth-0.1.1.dist-info/top_level.txt,sha256=hNXi_YDQ5FI_Qn4MC4AX0KeWf8KMAcTIk7jsGhoRRMA,7
-mm_eth-0.1.1.dist-info/RECORD,,
+mm_eth-0.1.3.dist-info/METADATA,sha256=8RNO36nSl-kmghoYRLQqSRBGVIPBABxccC9vl_Mkueo,227
+mm_eth-0.1.3.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+mm_eth-0.1.3.dist-info/entry_points.txt,sha256=aGhpsozl8NIrkuUcX5fSgURCcDhr3ShUdeTSIrJq4oc,46
+mm_eth-0.1.3.dist-info/RECORD,,

{mm_eth-0.1.1.dist-info → mm_eth-0.1.3.dist-info}/WHEEL

@@ -1,5 +1,4 @@
 Wheel-Version: 1.0
-Generator: setuptools (73.0.1)
+Generator: hatchling 1.25.0
 Root-Is-Purelib: true
 Tag: py3-none-any
-

mm_eth-0.1.1.dist-info/METADATA

@@ -1,10 +0,0 @@
-Metadata-Version: 2.1
-Name: mm-eth
-Version: 0.1.1
-Requires-Python: >=3.12
-Requires-Dist: mm-std ~=0.1.0
-Requires-Dist: websocket-client ~=1.8.0
-Requires-Dist: web3 ~=6.20.0
-Requires-Dist: typer ~=0.12.0
-Requires-Dist: loguru ~=0.7.2
-

mm_eth-0.1.1.dist-info/top_level.txt

@@ -1 +0,0 @@
-mm_eth