py-geth 5.2.1__tar.gz → 5.4.0__tar.gz

{py_geth-5.2.1/py_geth.egg-info → py_geth-5.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: py-geth
-Version: 5.2.1
+Version: 5.4.0
 Summary: py-geth: Run Go-Ethereum as a subprocess
 Home-page: https://github.com/ethereum/py-geth
 Author: The Ethereum Foundation
@@ -54,6 +54,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python
@@ -138,6 +139,8 @@ False
 False
 >>> geth.is_stopped
 True
+>>> geth.version
+"1.15.7-stable"
 ```
 
 When testing it can be nice to see the logging output produced by the `geth`
@@ -177,19 +180,19 @@ the current list of supported versions.
 Installation can be done via the command line:
 
 ```bash
-$ python -m geth.install v1.14.13
+$ python -m geth.install v1.15.7
 ```
 
 Or from python using the `install_geth` function.
 
 ```python
 >>> from geth import install_geth
->>> install_geth('v1.14.13')
+>>> install_geth('v1.15.7')
 ```
 
 The installed binary can be found in the `$HOME/.py-geth` directory, under your
-home directory.  The `v1.14.13` binary would be located at
-`$HOME/.py-geth/geth-v1.14.13/bin/geth`.
+home directory.  The `v1.15.7` binary would be located at
+`$HOME/.py-geth/geth-v1.15.7/bin/geth`.
 
 ## About `DevGethProcess`
 

{py_geth-5.2.1 → py_geth-5.4.0}/README.md

@@ -77,6 +77,8 @@ False
 False
 >>> geth.is_stopped
 True
+>>> geth.version
+"1.15.7-stable"
 ```
 
 When testing it can be nice to see the logging output produced by the `geth`
@@ -116,19 +118,19 @@ the current list of supported versions.
 Installation can be done via the command line:
 
 ```bash
-$ python -m geth.install v1.14.13
+$ python -m geth.install v1.15.7
 ```
 
 Or from python using the `install_geth` function.
 
 ```python
 >>> from geth import install_geth
->>> install_geth('v1.14.13')
+>>> install_geth('v1.15.7')
 ```
 
 The installed binary can be found in the `$HOME/.py-geth` directory, under your
-home directory.  The `v1.14.13` binary would be located at
-`$HOME/.py-geth/geth-v1.14.13/bin/geth`.
+home directory.  The `v1.15.7` binary would be located at
+`$HOME/.py-geth/geth-v1.15.7/bin/geth`.
 
 ## About `DevGethProcess`
 

{py_geth-5.2.1 → py_geth-5.4.0}/geth/chain.py

@@ -26,7 +26,6 @@ from .utils.filesystem import (
     is_same_path,
 )
 from .utils.validation import (
-    fill_default_genesis_data,
     validate_genesis_data,
 )
 from .wrapper import (
@@ -118,13 +117,9 @@ def write_genesis_file(
         )
 
     validate_genesis_data(genesis_data)
-    # use GenesisData model to fill defaults
-    filled_genesis_data_model = fill_default_genesis_data(genesis_data)
 
     with open(genesis_file_path, "w") as genesis_file:
-        genesis_file.write(
-            json.dumps(force_obj_to_text(filled_genesis_data_model.model_dump()))
-        )
+        genesis_file.write(force_obj_to_text(json.dumps(genesis_data)))
 
 
 def initialize_chain(genesis_data: GenesisDataTypedDict, data_dir: str) -> None:

{py_geth-5.2.1 → py_geth-5.4.0}/geth/genesis.json

@@ -16,7 +16,20 @@
         "terminalTotalDifficulty": 0,
         "terminalTotalDifficultyPassed": true,
         "shanghaiTime": 0,
-        "cancunTime": 0
+        "cancunTime": 0,
+        "blobSchedule": {
+            "cancun": {
+                "target": 3,
+                "max": 6,
+                "baseFeeUpdateFraction": 3338477
+            },
+            "prague": {
+                "target": 6,
+                "max": 9,
+                "baseFeeUpdateFraction": 5007716
+            }
+        }
+
     },
     "nonce": "0x0",
     "timestamp": "0x0",

{py_geth-5.2.1 → py_geth-5.4.0}/geth/install.py

@@ -47,6 +47,14 @@ V1_14_10 = "v1.14.10"
 V1_14_11 = "v1.14.11"
 V1_14_12 = "v1.14.12"
 V1_14_13 = "v1.14.13"
+V1_15_0 = "v1.15.0"
+V1_15_1 = "v1.15.1"
+V1_15_2 = "v1.15.2"
+V1_15_3 = "v1.15.3"
+V1_15_4 = "v1.15.4"
+V1_15_5 = "v1.15.5"
+V1_15_6 = "v1.15.6"
+V1_15_7 = "v1.15.7"
 
 
 LINUX = "linux"
@@ -343,6 +351,14 @@ install_v1_14_10 = functools.partial(install_from_source_code_release, V1_14_10)
 install_v1_14_11 = functools.partial(install_from_source_code_release, V1_14_11)
 install_v1_14_12 = functools.partial(install_from_source_code_release, V1_14_12)
 install_v1_14_13 = functools.partial(install_from_source_code_release, V1_14_13)
+install_v1_15_0 = functools.partial(install_from_source_code_release, V1_15_0)
+install_v1_15_1 = functools.partial(install_from_source_code_release, V1_15_1)
+install_v1_15_2 = functools.partial(install_from_source_code_release, V1_15_2)
+install_v1_15_3 = functools.partial(install_from_source_code_release, V1_15_3)
+install_v1_15_4 = functools.partial(install_from_source_code_release, V1_15_4)
+install_v1_15_5 = functools.partial(install_from_source_code_release, V1_15_5)
+install_v1_15_6 = functools.partial(install_from_source_code_release, V1_15_6)
+install_v1_15_7 = functools.partial(install_from_source_code_release, V1_15_7)
 
 INSTALL_FUNCTIONS = {
     LINUX: {
@@ -359,6 +375,14 @@ INSTALL_FUNCTIONS = {
         V1_14_11: install_v1_14_11,
         V1_14_12: install_v1_14_12,
         V1_14_13: install_v1_14_13,
+        V1_15_0: install_v1_15_0,
+        V1_15_1: install_v1_15_1,
+        V1_15_2: install_v1_15_2,
+        V1_15_3: install_v1_15_3,
+        V1_15_4: install_v1_15_4,
+        V1_15_5: install_v1_15_5,
+        V1_15_6: install_v1_15_6,
+        V1_15_7: install_v1_15_7,
     },
     OSX: {
         V1_14_0: install_v1_14_0,
@@ -374,6 +398,14 @@ INSTALL_FUNCTIONS = {
         V1_14_11: install_v1_14_11,
         V1_14_12: install_v1_14_12,
         V1_14_13: install_v1_14_13,
+        V1_15_0: install_v1_15_0,
+        V1_15_1: install_v1_15_1,
+        V1_15_2: install_v1_15_2,
+        V1_15_3: install_v1_15_3,
+        V1_15_4: install_v1_15_4,
+        V1_15_5: install_v1_15_5,
+        V1_15_6: install_v1_15_6,
+        V1_15_7: install_v1_15_7,
     },
 }
 

{py_geth-5.2.1 → py_geth-5.4.0}/geth/process.py

@@ -6,6 +6,7 @@ from abc import (
     ABC,
     abstractmethod,
 )
+import copy
 import json
 import logging
 import os
@@ -216,6 +217,10 @@ class BaseGethProcess(ABC):
                 time.sleep(0.1)
                 _timeout.check()
 
+    @property
+    def version(self) -> str:
+        return str(get_geth_version(**self.geth_kwargs))
+
 
 class MainnetGethProcess(BaseGethProcess):
     def __init__(self, geth_kwargs: GethKwargsTypedDict | None = None):
@@ -282,7 +287,8 @@ class DevGethProcess(BaseGethProcess):
             overrides = {}
 
         if genesis_data is None:
-            genesis_data = GenesisDataTypedDict(**GENESIS_JSON)
+            # deepcopy since we may modify the data on init below
+            genesis_data = GenesisDataTypedDict(**copy.deepcopy(GENESIS_JSON))
 
         validate_genesis_data(genesis_data)
 

{py_geth-5.2.1 → py_geth-5.4.0}/geth/utils/validation.py

@@ -11,6 +11,7 @@ from pydantic import (
     BaseModel,
     ConfigDict,
     ValidationError,
+    model_validator,
 )
 
 from geth.exceptions import (
@@ -72,52 +73,67 @@ def validate_geth_kwargs(geth_kwargs: GethKwargsTypedDict) -> None:
 
 
 class GenesisDataConfig(BaseModel):
-    chainId: int = 0
-    ethash: dict[str, Any] = {}  # so that geth treats config as PoW -> PoS transition
-    homesteadBlock: int = 0
-    daoForkBlock: int = 0
-    daoForkSupport: bool = True
-    eip150Block: int = 0
-    eip155Block: int = 0
-    eip158Block: int = 0
-    byzantiumBlock: int = 0
-    constantinopleBlock: int = 0
-    petersburgBlock: int = 0
-    istanbulBlock: int = 0
-    berlinBlock: int = 0
-    londonBlock: int = 0
-    arrowGlacierBlock: int = 0
-    grayGlacierBlock: int = 0
+    """
+    Default values are pulled from the ``genesis.json`` file internal to the repository.
+    """
+
+    chainId: int | None = None
+    ethash: dict[str, Any] | None = None
+    homesteadBlock: int | None = None
+    daoForkBlock: int | None = None
+    daoForkSupport: bool | None = None
+    eip150Block: int | None = None
+    eip155Block: int | None = None
+    eip158Block: int | None = None
+    byzantiumBlock: int | None = None
+    constantinopleBlock: int | None = None
+    petersburgBlock: int | None = None
+    istanbulBlock: int | None = None
+    berlinBlock: int | None = None
+    londonBlock: int | None = None
+    arrowGlacierBlock: int | None = None
+    grayGlacierBlock: int | None = None
     # merge
-    terminalTotalDifficulty: int = 0
-    terminalTotalDifficultyPassed: bool = True
+    terminalTotalDifficulty: int | None = None
+    terminalTotalDifficultyPassed: bool | None = None
     # post-merge, timestamp is used for network transitions
-    shanghaiTime: int = 0
-    cancunTime: int = 0
-
-    model_config = ConfigDict(extra="forbid")
+    shanghaiTime: int | None = None
+    cancunTime: int | None = None
+    pragueTime: int | None = None
+    # blobs
+    blobSchedule: dict[str, Any] = {}
+
+    @model_validator(mode="after")
+    def check_blob_schedule_required(
+        self,
+    ) -> GenesisDataConfig:
+        if self.cancunTime and not self.blobSchedule.get("cancun"):
+            raise PyGethValueError(
+                "blobSchedule 'cancun' value is required when cancunTime is set"
+            )
+        if self.pragueTime and not self.blobSchedule.get("prague"):
+            raise PyGethValueError(
+                "blobSchedule 'prague' value is required when pragueTime is set"
+            )
+        return self
 
 
 class GenesisData(BaseModel):
     alloc: dict[str, dict[str, Any]] = {}
-    baseFeePerGas: str = "0x0"
-    blobGasUsed: str = "0x0"
-    coinbase: str = "0x3333333333333333333333333333333333333333"
+    baseFeePerGas: str | None = None
+    blobGasUsed: str | None = None
+    coinbase: str | None = None
     config: dict[str, Any] = GenesisDataConfig().model_dump()
-    difficulty: str = "0x0"
-    excessBlobGas: str = "0x0"
-    extraData: str = (
-        "0x0000000000000000000000000000000000000000000000000000000000000000"
-    )
-    gasLimit: str = "0x47e7c4"
-    gasUsed: str = "0x0"
-    mixHash: str = "0x0000000000000000000000000000000000000000000000000000000000000000"
-    nonce: str = "0x0"
-    number: str = "0x0"
-    parentHash: str = (
-        "0x0000000000000000000000000000000000000000000000000000000000000000"
-    )
-    timestamp: str = "0x0"
+    difficulty: str | None = None
+    excessBlobGas: str | None = None
+    extraData: str | None = None
+    gasLimit: str | None = None
+    gasUsed: str | None = None
+    mixHash: str | None = None
+    nonce: str | None = None
+    number: str | None = None
+    parentHash: str | None = None
+    timestamp: str | None = None
 
     model_config = ConfigDict(extra="forbid")
 
@@ -146,35 +162,3 @@ def validate_genesis_data(genesis_data: GenesisDataTypedDict) -> None:
             raise PyGethValueError(
                 f"error while validating genesis_data config field: {e}"
             )
-
-
-def fill_default_genesis_data(
-    genesis_data: GenesisDataTypedDict,
-) -> GenesisData:
-    """
-    Fills in default values for the genesis data
-    """
-    try:
-        genesis_data_filled = GenesisData(**genesis_data)
-    except ValidationError as e:
-        raise PyGethValueError(
-            f"genesis_data validation failed while filling defaults: {e}"
-        )
-    except TypeError as e:
-        raise PyGethValueError(f"error while filling default genesis_data: {e}")
-
-    if genesis_data.get("config"):
-        try:
-            genesis_data_config_filled = GenesisDataConfig(**genesis_data["config"])
-        except ValidationError as e:
-            raise PyGethValueError(
-                f"genesis_data validation failed while filling config defaults: {e}"
-            )
-        except TypeError as e:
-            raise PyGethValueError(
-                f"error while filling default genesis_data config: {e}"
-            )
-
-        genesis_data_filled.config = genesis_data_config_filled.model_dump()
-
-    return genesis_data_filled

{py_geth-5.2.1 → py_geth-5.4.0/py_geth.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: py-geth
-Version: 5.2.1
+Version: 5.4.0
 Summary: py-geth: Run Go-Ethereum as a subprocess
 Home-page: https://github.com/ethereum/py-geth
 Author: The Ethereum Foundation
@@ -54,6 +54,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python
@@ -138,6 +139,8 @@ False
 False
 >>> geth.is_stopped
 True
+>>> geth.version
+"1.15.7-stable"
 ```
 
 When testing it can be nice to see the logging output produced by the `geth`
@@ -177,19 +180,19 @@ the current list of supported versions.
 Installation can be done via the command line:
 
 ```bash
-$ python -m geth.install v1.14.13
+$ python -m geth.install v1.15.7
 ```
 
 Or from python using the `install_geth` function.
 
 ```python
 >>> from geth import install_geth
->>> install_geth('v1.14.13')
+>>> install_geth('v1.15.7')
 ```
 
 The installed binary can be found in the `$HOME/.py-geth` directory, under your
-home directory.  The `v1.14.13` binary would be located at
-`$HOME/.py-geth/geth-v1.14.13/bin/geth`.
+home directory.  The `v1.15.7` binary would be located at
+`$HOME/.py-geth/geth-v1.15.7/bin/geth`.
 
 ## About `DevGethProcess`
 

{py_geth-5.2.1 → py_geth-5.4.0}/py_geth.egg-info/SOURCES.txt

@@ -38,10 +38,16 @@ tests/core/accounts/conftest.py
 tests/core/accounts/test_account_list_parsing.py
 tests/core/accounts/test_create_geth_account.py
 tests/core/accounts/test_geth_accounts.py
+tests/core/accounts/projects/test-01/geth/LOCK
+tests/core/accounts/projects/test-01/geth/nodekey
 tests/core/accounts/projects/test-01/keystore/UTC--2015-08-24T21-30-14.222885490Z--ae71658b3ab452f7e4f03bda6f777b860b2e2ff2
+tests/core/accounts/projects/test-02/geth/LOCK
+tests/core/accounts/projects/test-02/geth/nodekey
 tests/core/accounts/projects/test-02/keystore/UTC--2015-08-24T21-30-14.222885490Z--ae71658b3ab452f7e4f03bda6f777b860b2e2ff2
 tests/core/accounts/projects/test-02/keystore/UTC--2015-08-24T21-32-00.716418819Z--e8e085862a8d951dd78ec5ea784b3e22ee1ca9c6
 tests/core/accounts/projects/test-02/keystore/UTC--2015-08-24T21-32-04.748321142Z--0da70f43a568e88168436be52ed129f4a9bbdaf5
+tests/core/accounts/projects/test-03/geth/LOCK
+tests/core/accounts/projects/test-03/geth/nodekey
 tests/core/running/test_running_dev_chain.py
 tests/core/running/test_running_mainnet_chain.py
 tests/core/running/test_running_sepolia_chain.py

{py_geth-5.2.1 → py_geth-5.4.0}/pyproject.toml

@@ -125,7 +125,7 @@ name = "Removals"
 showcontent = true
 
 [tool.bumpversion]
-current_version = "5.2.1"
+current_version = "5.4.0"
 parse = """
     (?P<major>\\d+)
     \\.(?P<minor>\\d+)

{py_geth-5.2.1 → py_geth-5.4.0}/setup.py

@@ -37,7 +37,7 @@ with open("./README.md") as readme:
 setup(
     name="py-geth",
     # *IMPORTANT*: Don't manually change the version here. Use the 'bump-my-version' utility.
-    version="5.2.1",
+    version="5.4.0",
     description="""py-geth: Run Go-Ethereum as a subprocess""",
     long_description_content_type="text/markdown",
     long_description=long_description,

py_geth-5.4.0/tests/core/accounts/projects/test-01/geth/nodekey

@@ -0,0 +1 @@
+46cf87d2c3661d137fa3901cfeff7f58b74a4f118d004199580fd588eba10b5e

py_geth-5.4.0/tests/core/accounts/projects/test-02/geth/nodekey

@@ -0,0 +1 @@
+9fb3c3964107a7f76a2474221384c21dc0288552d59ef9aa3317c4e3a1e2045e

py_geth-5.4.0/tests/core/accounts/projects/test-03/geth/nodekey

@@ -0,0 +1 @@
+b0352dc57ebd8601c833b6079e0140a38174c58f13b24f292e0fccc708fe2e4d

py_geth-5.4.0/tests/core/running/test_running_dev_chain.py

@@ -0,0 +1,95 @@
+import copy
+import json
+import os
+import re
+
+from geth import (
+    DevGethProcess,
+)
+
+# open genesis.json file from geth main directory
+MAIN_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", ".."))
+
+with open(os.path.join(MAIN_DIR, "geth", "genesis.json")) as genesis_file:
+    GENESIS_JSON = json.load(genesis_file)
+
+
+def test_version():
+    geth = DevGethProcess("testing")
+    # x.y.z-stable
+    regex = re.compile(r"\d+\.\d+\.\d+-stable")
+    assert regex.match(geth.version)
+
+
+def test_with_no_overrides(base_dir):
+    geth = DevGethProcess("testing", base_dir=base_dir)
+
+    geth.start()
+    assert geth.is_running
+    assert geth.is_alive
+    geth.stop()
+    assert geth.is_stopped
+
+
+def test_dev_geth_process_generates_accounts(base_dir):
+    geth = DevGethProcess("testing", base_dir=base_dir)
+    assert len(set(geth.accounts)) == 1
+
+
+def test_dev_geth_process_generates_genesis_json_from_genesis_data(base_dir):
+    shanghai_genesis = copy.deepcopy(GENESIS_JSON)
+    config = shanghai_genesis.pop("config")
+
+    # stop at Shanghai, drop any keys in config after `shanghaiTime`
+    shanghai_config = {}
+    for key, _value in config.items():
+        shanghai_config[key] = config[key]
+        if key == "shanghaiTime":
+            break
+
+    assert "cancunTime" not in shanghai_config
+    shanghai_genesis["config"] = shanghai_config
+
+    geth = DevGethProcess("testing", base_dir=base_dir, genesis_data=shanghai_genesis)
+
+    # assert genesis.json exists and has the correct data
+    assert os.path.exists(os.path.join(geth.data_dir, "genesis.json"))
+    with open(os.path.join(geth.data_dir, "genesis.json")) as genesis_file:
+        genesis_data = json.load(genesis_file)
+
+    assert genesis_data == shanghai_genesis
+
+    geth.start()
+    assert geth.is_running
+    assert geth.is_alive
+    geth.stop()
+    assert geth.is_stopped
+
+
+def test_default_config(base_dir):
+    geth = DevGethProcess("testing", base_dir=base_dir)
+
+    assert os.path.exists(os.path.join(geth.data_dir, "genesis.json"))
+    with open(os.path.join(geth.data_dir, "genesis.json")) as genesis_file:
+        genesis_data = json.load(genesis_file)
+
+    # assert genesis_data == GENESIS_JSON with the exception of an added coinbase and
+    # alloc for that coinbase
+    injected_coinbase = genesis_data.pop("coinbase")
+    assert injected_coinbase in genesis_data["alloc"]
+    assert injected_coinbase in geth.accounts
+
+    injected_cb_alloc = genesis_data["alloc"].pop(injected_coinbase)
+    assert injected_cb_alloc == {"balance": "1000000000000000000000000000000"}
+
+    try:
+        assert genesis_data == GENESIS_JSON
+    except AssertionError:
+        assert geth.version.startswith("1.14.0")
+        assert genesis_data["config"]["terminalTotalDifficulty"] == -1
+
+    geth.start()
+    assert geth.is_running
+    assert geth.is_alive
+    geth.stop()
+    assert geth.is_stopped

py_geth-5.4.0/tests/core/utility/test_validation.py

@@ -0,0 +1,92 @@
+from __future__ import (
+    annotations,
+)
+
+import pytest
+
+from geth.exceptions import (
+    PyGethValueError,
+)
+from geth.utils.validation import (
+    validate_genesis_data,
+    validate_geth_kwargs,
+)
+
+
+@pytest.mark.parametrize(
+    "geth_kwargs",
+    [
+        {
+            "data_dir": "/tmp",
+            "network_id": "123",
+            "rpc_port": "1234",
+            "dev_mode": True,
+        },
+    ],
+)
+def test_validate_geth_kwargs_good(geth_kwargs):
+    assert validate_geth_kwargs(geth_kwargs) is None
+
+
+@pytest.mark.parametrize(
+    "geth_kwargs",
+    [
+        {
+            "data_dir": "/tmp",
+            "network_id": 123,
+            "dev_mode": "abc",
+        }
+    ],
+)
+def test_validate_geth_kwargs_bad(geth_kwargs):
+    with pytest.raises(PyGethValueError):
+        validate_geth_kwargs(geth_kwargs)
+
+
+@pytest.mark.parametrize(
+    "genesis_data",
+    [
+        {
+            "difficulty": "0x00012131",
+            "nonce": "abc",
+            "timestamp": "1234",
+        }
+    ],
+)
+def test_validate_genesis_data_good(genesis_data):
+    assert validate_genesis_data(genesis_data) is None
+
+
+@pytest.mark.parametrize(
+    "genesis_data",
+    [
+        {
+            "difficulty": "0x00012131",
+            "nonce": "abc",
+            "cats": "1234",
+        },
+        {
+            "difficulty": "0x00012131",
+            "nonce": "abc",
+            "config": "1234",
+        },
+        {
+            "difficulty": "0x00012131",
+            "nonce": "abc",
+            "config": None,
+        },
+        "kangaroo",
+        {
+            "difficulty": "0x00012131",
+            "nonce": "abc",
+            "timestamp": "1234",
+            "config": {
+                "cancunTime": 5,
+                "blobSchedule": {},
+            },
+        },
+    ],
+)
+def test_validate_genesis_data_bad(genesis_data):
+    with pytest.raises(PyGethValueError):
+        validate_genesis_data(genesis_data)

py_geth-5.2.1/tests/core/running/test_running_dev_chain.py

@@ -1,21 +0,0 @@
-from geth import (
-    DevGethProcess,
-)
-
-
-def test_with_no_overrides(base_dir):
-    geth = DevGethProcess("testing", base_dir=base_dir)
-
-    geth.start()
-
-    assert geth.is_running
-    assert geth.is_alive
-
-    geth.stop()
-
-    assert geth.is_stopped
-
-
-def test_dev_geth_process_generates_accounts(base_dir):
-    geth = DevGethProcess("testing", base_dir=base_dir)
-    assert len(set(geth.accounts)) == 1

py_geth-5.2.1/tests/core/utility/test_validation.py

@@ -1,269 +0,0 @@
-from __future__ import (
-    annotations,
-)
-
-import pytest
-import sys
-from typing import (
-    get_type_hints,
-)
-
-from geth.exceptions import (
-    PyGethValueError,
-)
-from geth.types import (
-    GenesisDataTypedDict,
-)
-from geth.utils.validation import (
-    GenesisData,
-    fill_default_genesis_data,
-    validate_genesis_data,
-    validate_geth_kwargs,
-)
-
-
-@pytest.mark.parametrize(
-    "geth_kwargs",
-    [
-        {
-            "data_dir": "/tmp",
-            "network_id": "123",
-            "rpc_port": "1234",
-            "dev_mode": True,
-        },
-    ],
-)
-def test_validate_geth_kwargs_good(geth_kwargs):
-    assert validate_geth_kwargs(geth_kwargs) is None
-
-
-@pytest.mark.parametrize(
-    "geth_kwargs",
-    [
-        {
-            "data_dir": "/tmp",
-            "network_id": 123,
-            "dev_mode": "abc",
-        }
-    ],
-)
-def test_validate_geth_kwargs_bad(geth_kwargs):
-    with pytest.raises(PyGethValueError):
-        validate_geth_kwargs(geth_kwargs)
-
-
-@pytest.mark.parametrize(
-    "genesis_data",
-    [
-        {
-            "difficulty": "0x00012131",
-            "nonce": "abc",
-            "timestamp": "1234",
-        }
-    ],
-)
-def test_validate_genesis_data_good(genesis_data):
-    assert validate_genesis_data(genesis_data) is None
-
-
-@pytest.mark.parametrize(
-    "genesis_data",
-    [
-        {
-            "difficulty": "0x00012131",
-            "nonce": "abc",
-            "cats": "1234",
-        },
-        {
-            "difficulty": "0x00012131",
-            "nonce": "abc",
-            "config": "1234",
-        },
-        {
-            "difficulty": "0x00012131",
-            "nonce": "abc",
-            "config": None,
-        },
-        "kangaroo",
-    ],
-)
-def test_validate_genesis_data_bad(genesis_data):
-    with pytest.raises(PyGethValueError):
-        validate_genesis_data(genesis_data)
-
-
-@pytest.mark.parametrize(
-    "genesis_data,expected",
-    [
-        (
-            {
-                "difficulty": "0x00012131",
-                "nonce": "abc",
-                "timestamp": "1234",
-            },
-            {
-                "alloc": {},
-                "baseFeePerGas": "0x0",
-                "blobGasUsed": "0x0",
-                "coinbase": "0x3333333333333333333333333333333333333333",
-                "config": {
-                    "chainId": 0,
-                    "ethash": {},
-                    "homesteadBlock": 0,
-                    "daoForkBlock": 0,
-                    "daoForkSupport": True,
-                    "eip150Block": 0,
-                    "eip155Block": 0,
-                    "eip158Block": 0,
-                    "byzantiumBlock": 0,
-                    "constantinopleBlock": 0,
-                    "petersburgBlock": 0,
-                    "istanbulBlock": 0,
-                    "berlinBlock": 0,
-                    "londonBlock": 0,
-                    "arrowGlacierBlock": 0,
-                    "grayGlacierBlock": 0,
-                    "terminalTotalDifficulty": 0,
-                    "terminalTotalDifficultyPassed": True,
-                    "shanghaiTime": 0,
-                    "cancunTime": 0,
-                },
-                "difficulty": "0x00012131",
-                "excessBlobGas": "0x0",
-                "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-                "gasLimit": "0x47e7c4",
-                "gasUsed": "0x0",
-                "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-                "nonce": "abc",
-                "number": "0x0",
-                "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-                "timestamp": "1234",
-            },
-        ),
-        (
-            {
-                "difficulty": "0x00012131",
-                "nonce": "abc",
-                "config": {
-                    "homesteadBlock": 5,
-                    "daoForkBlock": 1,
-                    "daoForkSupport": False,
-                    "eip150Block": 27777777,
-                    "eip155Block": 99,
-                    "eip158Block": 32,
-                },
-            },
-            {
-                "alloc": {},
-                "baseFeePerGas": "0x0",
-                "blobGasUsed": "0x0",
-                "coinbase": "0x3333333333333333333333333333333333333333",
-                "config": {
-                    "chainId": 0,
-                    "ethash": {},
-                    "homesteadBlock": 5,
-                    "daoForkBlock": 1,
-                    "daoForkSupport": False,
-                    "eip150Block": 27777777,
-                    "eip155Block": 99,
-                    "eip158Block": 32,
-                    "byzantiumBlock": 0,
-                    "constantinopleBlock": 0,
-                    "petersburgBlock": 0,
-                    "istanbulBlock": 0,
-                    "berlinBlock": 0,
-                    "londonBlock": 0,
-                    "arrowGlacierBlock": 0,
-                    "grayGlacierBlock": 0,
-                    "terminalTotalDifficulty": 0,
-                    "terminalTotalDifficultyPassed": True,
-                    "shanghaiTime": 0,
-                    "cancunTime": 0,
-                },
-                "difficulty": "0x00012131",
-                "excessBlobGas": "0x0",
-                "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-                "gasLimit": "0x47e7c4",
-                "gasUsed": "0x0",
-                "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-                "nonce": "abc",
-                "number": "0x0",
-                "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
-                "timestamp": "0x0",
-            },
-        ),
-    ],
-)
-def test_fill_default_genesis_data_good(genesis_data, expected):
-    genesis_data_td = GenesisDataTypedDict(**genesis_data)
-    filled_genesis_data = fill_default_genesis_data(genesis_data_td).model_dump()
-    assert filled_genesis_data == expected
-
-
-@pytest.mark.parametrize(
-    "genesis_data,expected_exception,expected_message",
-    [
-        (
-            {
-                "difficulty": "0x00012131",
-                "nonce": "abc",
-                "timestamp": 1234,
-            },
-            PyGethValueError,
-            "genesis_data validation failed while filling defaults: ",
-        ),
-        (
-            {
-                "difficulty": "0x00012131",
-                "nonce": "abc",
-                "config": {
-                    "homesteadBlock": 5,
-                    "daoForkBlock": "beep",
-                    "daoForkSupport": False,
-                    "eip150Block": 27777777,
-                    "eip155Block": 99,
-                    "eip158Block": 32,
-                },
-            },
-            PyGethValueError,
-            "genesis_data validation failed while filling config defaults: ",
-        ),
-        (
-            "abc123",
-            PyGethValueError,
-            "error while filling default genesis_data: ",
-        ),
-        (
-            {"difficulty": "0x00012131", "nonce": "abc", "config": ["beep"]},
-            PyGethValueError,
-            "genesis_data validation failed while filling defaults: ",
-        ),
-    ],
-)
-def test_fill_default_genesis_data_bad(
-    genesis_data, expected_exception, expected_message
-):
-    with pytest.raises(expected_exception) as excinfo:
-        fill_default_genesis_data(genesis_data)
-    assert str(excinfo.value).startswith(expected_message)
-
-
-@pytest.mark.skipif(sys.version_info < (3, 9), reason="get_type_hints requires >=py39")
-@pytest.mark.parametrize(
-    "model, typed_dict",
-    [
-        (GenesisData, GenesisDataTypedDict),
-    ],
-)
-def test_model_fields_match_typed_dict(model, typed_dict):
-    # Get the fields and types from the Pydantic model
-    model_fields = get_type_hints(model)
-    assert len(model_fields) > 0, "Model has no fields"
-
-    # Get the fields and types from the TypedDict
-    typed_dict_fields = get_type_hints(typed_dict)
-    assert len(typed_dict_fields) > 0, "TypedDict has no fields"
-    assert len(typed_dict_fields) == len(model_fields), "Field counts do not match"
-
-    # Verify that the fields match
-    assert model_fields == typed_dict_fields, "Fields do not match"