mm-eth 0.2.3__tar.gz → 0.2.5__tar.gz

{mm_eth-0.2.3 → mm_eth-0.2.5}/PKG-INFO

@@ -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 → mm_eth-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mm-eth"
-version = "0.2.3"
+version = "0.2.5"
 description = ""
 requires-python = ">=3.12"
 dependencies = [
@@ -47,6 +47,7 @@ target-version = "py313"
 [tool.ruff.lint]
 select = ["ALL"]
 ignore = [
+    "TC", # flake8-type-checking, TYPE_CHECKING is dangerous, for example it doesn't work with pydantic
     "A005", # flake8-builtins: stdlib-module-shadowing
     "ERA001", # eradicate: commented-out-code
     "PT", # flake8-pytest-style
@@ -68,6 +69,8 @@ ignore = [
     "RET503", # flake8-return: implicit-return
     "COM812", # it's used in ruff formatter
 ]
+[tool.ruff.lint.pep8-naming]
+classmethod-decorators = ["field_validator"]
 [tool.ruff.lint.per-file-ignores]
 "tests/*.py" = ["ANN", "S"]
 [tool.ruff.format]

{mm_eth-0.2.3 → mm_eth-0.2.5}/src/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-0.2.3 → mm_eth-0.2.5}/src/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-0.2.3 → mm_eth-0.2.5}/src/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-0.2.3 → mm_eth-0.2.5}/src/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-0.2.3 → mm_eth-0.2.5}/src/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-0.2.3 → mm_eth-0.2.5}/src/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-0.2.3 → mm_eth-0.2.5}/src/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-0.2.3 → mm_eth-0.2.5}/src/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-0.2.3 → mm_eth-0.2.5}/src/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: