mm-eth 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

mm_eth/abi.py

@@ -64,7 +64,7 @@ def decode_function_input(contract_abi: ABI, tx_input: str) -> FunctionInput:
 
 
 def get_function_abi(contr_abi: ABI, fn_name: str) -> ABIFunction:
-    abi = pydash.find(contr_abi, lambda x: x.get("name", None) == fn_name and x.get("type", None) == "function")  # type:ignore
+    abi = pydash.find(contr_abi, lambda x: x.get("name", None) == fn_name and x.get("type", None) == "function")  # type: ignore[call-overload, attr-defined]
     if not abi:
         raise ValueError("can't find abi for function: " + fn_name)
     return cast(ABIFunction, abi)
@@ -122,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"]  # type: ignore
-            types = ",".join([i["type"] for i in item["inputs"]])  # type: ignore
+            function_name = item["name"]  # type: ignore[typeddict-item]
+            types = ",".join([i["type"] for i in item["inputs"]])  # type: ignore[typeddict-item]
             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

@@ -67,6 +67,6 @@ def create_private_keys_dict(private_keys: list[str]) -> dict[str, str]:  # addr
 def is_private_key(private_key: str) -> bool:
     try:
         key_api.PrivateKey(decode_hex(private_key)).public_key.to_address()
-        return True
+        return True  # noqa: TRY300
     except Exception:
         return False

mm_eth/anvil.py

@@ -10,7 +10,7 @@ from mm_eth import account, rpc
 
 
 class Anvil:
-    def __init__(self, *, chain_id: int, port: int, mnemonic: str):
+    def __init__(self, *, chain_id: int, port: int, mnemonic: str) -> None:
         self.chain_id = chain_id
         self.port = port
         self.mnemonic = mnemonic
@@ -18,7 +18,7 @@ class Anvil:
 
     def start_process(self) -> None:
         cmd = f"anvil -m '{self.mnemonic}' -p {self.port} --chain-id {self.chain_id}"
-        self.process = Popen(cmd, shell=True)  # nosec
+        self.process = Popen(cmd, shell=True)  # noqa: S602 # nosec
         time.sleep(3)
 
     def stop(self) -> None:

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,11 +11,15 @@ 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")
 
@@ -108,10 +112,7 @@ def get_decimals(rpc_urls: Nodes, address: str, timeout: int = 10, proxies: Prox
         if res.ok == "0x":
             return Err("no_decimals", data=res.data)
 
-        if len(res.ok) > 66:
-            result = eth_utils.to_int(hexstr=res.ok[0:66])
-        else:
-            result = eth_utils.to_int(hexstr=res.ok)
+        result = eth_utils.to_int(hexstr=res.ok[0:66]) if len(res.ok) > 66 else eth_utils.to_int(hexstr=res.ok)
         return Ok(result, data=res.data)
 
     except Exception as e:

mm_eth/rpc.py

@@ -2,16 +2,19 @@ from __future__ import annotations
 
 import json
 from dataclasses import dataclass
-from typing import Any, Literal, cast
+from typing import TYPE_CHECKING, 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:
@@ -85,10 +88,7 @@ def rpc_call(
     res: Result[Any] = Err("not started yet")
     for _ in range(attempts):
         node = random_node(nodes)
-        if node.startswith("http"):
-            res = _http_call(node, data, timeout, random_proxy(proxies))
-        else:
-            res = _ws_call(node, data, timeout)
+        res = _http_call(node, data, timeout, random_proxy(proxies)) if node.startswith("http") else _ws_call(node, data, timeout)
         if isinstance(res, Ok):
             return res
     return res
@@ -444,7 +444,7 @@ def eth_syncing(rpc_urls: Nodes, timeout: int = 10, proxies: Proxies = None, att
                 result[k] = int(v, 16)
             else:
                 result[k] = v
-        if result.get("currentBlock", None) and result.get("highestBlock", None):
+        if result.get("currentBlock") and result.get("highestBlock"):
             result["remaining"] = result["highestBlock"] - result["currentBlock"]
         return Ok(result, res.data)
 

mm_eth/solc.py

@@ -1,4 +1,3 @@
-import os.path
 import random
 import shutil
 from dataclasses import dataclass
@@ -15,9 +14,9 @@ class SolcResult:
 
 def solc(contract_name: str, contract_path: str, tmp_dir: str) -> Result[SolcResult]:
     if tmp_dir.startswith("~"):
-        tmp_dir = os.path.expanduser(tmp_dir)
+        tmp_dir = Path(tmp_dir).expanduser().as_posix()
     if contract_path.startswith("~"):
-        contract_path = os.path.expanduser(contract_path)
+        contract_path = Path(contract_path).expanduser().as_posix()
     work_dir = f"{tmp_dir}/solc_{contract_name}_{random.randint(0, 100_000_000)}"
     abi_path = f"{work_dir}/{contract_name}.abi"
     bin_path = f"{work_dir}/{contract_name}.bin"

mm_eth/tx.py

@@ -44,14 +44,12 @@ class RPLTransaction(rlp.Serializable):  # type: ignore[misc]
         to: str | None = None,
     ) -> RPLTransaction:
         if to:
-            to = hex_to_bytes(to)  # type:ignore
+            to = hex_to_bytes(to)  # type: ignore[assignment]
         if data:
-            data = hex_to_bytes(data)  # type:ignore
+            data = hex_to_bytes(data)  # type: ignore[assignment]
         if not value:
             value = 0
-        r = int(r, 16)  # type:ignore
-        s = int(s, 16)  # type:ignore
-        return RPLTransaction(nonce, gas_price, gas, to, value, data, v, r, s)
+        return RPLTransaction(nonce, gas_price, gas, to, value, data, v, int(r, 16), int(s, 16))
 
 
 class DecodedRawTx(BaseModel):

mm_eth/utils.py

@@ -16,23 +16,22 @@ from mm_eth.types import Nodes, Proxies
 
 
 def parse_addresses(data: str) -> list[str]:
-    data = data.lower()
     result = []
-    for word in data.split():
+    for word in data.lower().split():
         if len(word) == 42 and re.match("0x[a-f0-9]{40}", word):
-            result.append(word)
+            result.append(word)  # noqa: PERF401
     return pydash.uniq(result)
 
 
 def to_token_wei(value: str | int, decimals: int) -> int:
     if isinstance(value, int):
         return value
-    elif isinstance(value, str):
+    if isinstance(value, str):
         value = value.lower().replace(" ", "").strip()
         if value.endswith("t"):
             value = value.replace("t", "")
             return int(Decimal(value) * 10**decimals)
-        elif value.isdigit():
+        if value.isdigit():
             return int(value)
 
     raise ValueError("wrong value" + value)
@@ -41,11 +40,11 @@ def to_token_wei(value: str | int, decimals: int) -> int:
 def to_wei(value: str | int | Decimal, decimals: int | None = None) -> Wei:
     if isinstance(value, int):
         return Wei(value)
-    elif isinstance(value, Decimal):
+    if isinstance(value, Decimal):
         if value != value.to_integral_value():
             raise ValueError(f"value must be integral number: {value}")
         return Wei(int(value))
-    elif isinstance(value, str):
+    if isinstance(value, str):
         value = value.lower().replace(" ", "").strip()
         if value.endswith("navax"):  # https://snowtrace.io/unitconverter
             value = value.replace("navax", "")
@@ -68,8 +67,7 @@ def to_wei(value: str | int | Decimal, decimals: int | None = None) -> Wei:
             return Wei(int(value))
         raise ValueError("wrong value " + value)
 
-    else:
-        raise ValueError(f"value has a wrong type: {type(value)}")
+    raise ValueError(f"value has a wrong type: {type(value)}")
 
 
 def from_wei(
@@ -125,11 +123,11 @@ def from_token_wei_str(value: int, decimals: int, symbol: str = "", round_ndigit
 def to_wei_token(value: str | int | Decimal, symbol: str, decimals: int) -> int:
     if isinstance(value, int):
         return value
-    elif isinstance(value, Decimal):
+    if isinstance(value, Decimal):
         if value != value.to_integral_value():
             raise ValueError(f"value must be integral number: {value}")
         return int(value)
-    elif isinstance(value, str):
+    if isinstance(value, str):
         value = value.lower().replace(" ", "").strip()
         if value.isdigit():
             return int(value)
@@ -138,7 +136,7 @@ def to_wei_token(value: str | int | Decimal, symbol: str, decimals: int) -> int:
         except Exception as e:
             raise ValueError from e
     else:
-        raise ValueError(f"value has a wrong type: {type(value)}")
+        raise TypeError(f"value has a wrong type: {type(value)}")
 
 
 def to_checksum_address(address: str) -> str:
@@ -185,10 +183,7 @@ def truncate_hex_str(hex_str: str, digits: int = 4, replace_str: str = "...") ->
 
 
 def log_topic_to_address(topic: HexBytes | str) -> str:
-    if isinstance(topic, HexBytes):
-        result = topic.hex()[-40:]
-    else:
-        result = topic[-40:]
+    result = topic.hex()[-40:] if isinstance(topic, HexBytes) else topic[-40:]
     if not result.startswith("0x"):
         result = f"0x{result}"
     return result

mm_eth/vault.py

@@ -15,7 +15,8 @@ def read_keys_from_vault(keys_url: str, token: str) -> Result[dict[str, str]]:
 
 
 def set_keys_from_vault(keys_url: str, token: str, private_keys: list[str], verify_tls: bool = True) -> Result[bool]:
-    """It works with KV version=1 only!!!"""  # TODO: check that keys_url is kv1 version and error if it's kv2
+    """It works with KV version=1 only!!!"""
+    # TODO: check that keys_url is kv1 version and error if it's kv2
     data = None
     try:
         # keys_url example, https://vault.site.com:8200/v1/kv/keys1
@@ -23,16 +24,15 @@ def set_keys_from_vault(keys_url: str, token: str, private_keys: list[str], veri
         for private_key in private_keys:
             address = private_to_address(private_key)
             if address is None:
-                raise ValueError("there is a wrong private key")
+                return Err("wrong private key", data=data)
             keys[address] = private_key
 
         res = hr(keys_url, method="post", headers={"X-Vault-Token": token}, params=keys, verify=verify_tls)
         data = res.json
         if res.code == 204:
             return Ok(res.code == 204, data=data)
-        elif res.code == 403:
+        if res.code == 403:
             return Err("permission denied", data=data)
-        else:
-            return Err(res.error or "error", data=data)
+        return Err(res.error or "error", data=data)
     except Exception as e:
         return Err(f"exception: {e}", data=data)

{mm_eth-0.2.0.dist-info → mm_eth-0.2.1.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: mm-eth
-Version: 0.2.0
+Version: 0.2.1
 Requires-Python: >=3.12
-Requires-Dist: mm-std~=0.1.9
-Requires-Dist: web3~=7.6.1
+Requires-Dist: mm-std~=0.1.10
+Requires-Dist: web3~=7.7.0
 Requires-Dist: websocket-client~=1.8.0

mm_eth-0.2.1.dist-info/RECORD

@@ -0,0 +1,18 @@
+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/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/ethernodes.py,sha256=9y_poTmFUj6cnWaT9mtfc6S9lAfVXTwLGRqxMQ8hT0Y,3080
+mm_eth/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_eth/rpc.py,sha256=F0jBzYw4wkh9LKwynXrzyhA08r5JTGrYAbwTH6C2Z7w,13872
+mm_eth/solc.py,sha256=dYRvT8PjZlLDZhNsc_-0790Eug_ZwU2G-iBfIdGj6wQ,1071
+mm_eth/tx.py,sha256=J5Wky8rmV6NlMFmAYF4997PscRYlUdkYFpEldH3BCNg,4014
+mm_eth/types.py,sha256=vXXP5Dc72BpHv5tsyws0KDZebG1W1-5HH0UjL7N2Mgc,113
+mm_eth/utils.py,sha256=NICgROKU5ZTrkY6nlSDLHjbbpYYswLoofyc3ozPdwBs,7804
+mm_eth/vault.py,sha256=h8NyiOQh5YFskh1lZA3KyvnJUnxl9769ME2ChplG0CM,1477
+mm_eth-0.2.1.dist-info/METADATA,sha256=VZ2A_K7tjKAWxIzkq6K3zk3PQv6hXDRs89oBvGgApB0,170
+mm_eth-0.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_eth-0.2.1.dist-info/RECORD,,

mm_eth-0.2.0.dist-info/RECORD

@@ -1,18 +0,0 @@
-mm_eth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_eth/abi.py,sha256=_xw2c7Eht3-g-fA6yvakHMcehzsRRK_LqTO7Q8Ppkj4,4794
-mm_eth/account.py,sha256=6iiCZ70ojptiaDI1UMaUdJT-SghuOexLeH0YJhCWQ8g,2022
-mm_eth/anvil.py,sha256=9CWXWyK7tVrvs6NeOy7QnVwMTrUke-nBMFwZeJ4VULA,1582
-mm_eth/deploy.py,sha256=SB3ruY808_5UnG8kHR34uVP66P3zOWZu0ImKD7UUv2s,691
-mm_eth/ens.py,sha256=WMxqC1v3zwDDuLH_oWekm22qrNYxCNcvZumQMT7SYds,623
-mm_eth/erc20.py,sha256=m62j00zizSZzXgLUEih2Q1iVFehU9qrqOMfc3gyix7k,6844
-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=qSkaPgow3QEZR0vbnQouw8X4G-Hw9RedPrDB10aZhU0,4046
-mm_eth/types.py,sha256=vXXP5Dc72BpHv5tsyws0KDZebG1W1-5HH0UjL7N2Mgc,113
-mm_eth/utils.py,sha256=kjCIsXtRTG0dL6A1bCCuWctqd0Qh8K8N-ZocQRppYj0,7861
-mm_eth/vault.py,sha256=1ahABcgyYAMUlE4ELMGdlG_uV4irmwzrfzUZTpo3rdY,1500
-mm_eth-0.2.0.dist-info/METADATA,sha256=J5m9XoyV6IPyS5YDrRpTmzTFR_pnEESJXJhuhzeAHB8,169
-mm_eth-0.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_eth-0.2.0.dist-info/RECORD,,