py-geth 5.2.1__py3-none-any.whl → 5.4.0__py3-none-any.whl

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:

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",

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,
     },
 }
 

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)
 

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.dist-info → py_geth-5.4.0.dist-info}/METADATA

@@ -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.dist-info → py_geth-5.4.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
 geth/__init__.py,sha256=vPIxujjhq68syWZuHJQy6vNxW6yqbi7M8hmEtYVoKWs,583
 geth/accounts.py,sha256=QxhjdyFT5JSgTswQiPsMMgCpTcV9-vaZiksDoWfePTI,5943
-geth/chain.py,sha256=VMbb1OMI8z-HRteYg7bDgDpf9-SyLYioy2OIYO7oW5s,3879
+geth/chain.py,sha256=7ZTmzLgkIB6UKcB1NSvMfTuF6RqO4lW0FtHz9uSJQ5s,3683
 geth/default_blockchain_password,sha256=7ZYUjo1py5Wh_uA_WvoXQG8mPv2CiJ07tI2tOodTLi8,30
 geth/exceptions.py,sha256=yLGBkLabY_W-43kW9iYPM3FaoR08JWgTWYW1RHukaeU,2643
-geth/genesis.json,sha256=E6pcGhk0pz1ByhRvyqeVbNAteOB4U1jOj4KiHtR2tAM,901
-geth/install.py,sha256=tMKxYX1ILTquKvhr8M3BHicfCt2ChnDq_iJamtkTaB4,11634
+geth/genesis.json,sha256=HPY88vd1cD0bXKB2Fd59EQ08oK6uVTOehHqSmckuYBY,1224
+geth/install.py,sha256=wQpgfXEQ_ZX133rPFkA28k7wUX-hI7ctOU77cxBYkBc,12970
 geth/main.py,sha256=jgWIs3o9BfHcqWfuq6l4JBjcdQzDy13-EJDP1c2ouhQ,1463
 geth/mixins.py,sha256=cpls-_Z9WZdmYbjhOZL-y6F1xRYAvmfWRed2DODe6D8,5639
-geth/process.py,sha256=SumVj-2Q7PQ-HZBaCcpN_PY9WkIqlRuy9hRo0VCpb2A,8864
+geth/process.py,sha256=MEEzmwxrIjNpTMINmm4OpraB8MR6ENht63zNultIOEc,9059
 geth/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geth/reset.py,sha256=IlKfr5PyjVi0rHjoGUY5kbjtnR9ZAsfSb1Jgzh0dDo0,2639
 geth/types.py,sha256=9BesREN7IuJVM2BagzUfIZ0VjJTAcRFJgEF7NyLHugY,1481
@@ -19,9 +19,9 @@ geth/utils/networking.py,sha256=ntH6CZuGcTJJ0BIdT4rI-EMz703VDbJAJzGcxufDQMo,1488
 geth/utils/proc.py,sha256=0CcHzOTkSzikrli_2ooQT6iHpPaTRYsshcvrGYC7btA,1801
 geth/utils/thread.py,sha256=IL4C-AvzYbOwW2qOIMS63GVEqiWLe9TiMXX20qT1UaY,315
 geth/utils/timeout.py,sha256=Uiz90EKJJm7UmKmVx2FhBpIblnvg9dTqszsanvfOtFM,2259
-geth/utils/validation.py,sha256=YeSoqpVjGXRNZUcqiUof39uVUZnmbrf-XU0C4LEZ0NU,5430
-py_geth-5.2.1.dist-info/LICENSE,sha256=ENGC4gSn0kYaC_mlaXOEwCKmA6W7Z9MeSemc5O2k-h0,1095
-py_geth-5.2.1.dist-info/METADATA,sha256=nGJfBfMvJn78-4hcIM_9qpwWFDyXYSEV3MiO1iHiGp0,9214
-py_geth-5.2.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-py_geth-5.2.1.dist-info/top_level.txt,sha256=o8Gvkxt3xBR7BNG2p9_G1J3GnGlTrBMEhYJBdAzBWDU,5
-py_geth-5.2.1.dist-info/RECORD,,
+geth/utils/validation.py,sha256=rMwaB2DSKNG8-NXx269YwUrOAfzuckqTBwA4wqjgebY,5030
+py_geth-5.4.0.dist-info/licenses/LICENSE,sha256=ENGC4gSn0kYaC_mlaXOEwCKmA6W7Z9MeSemc5O2k-h0,1095
+py_geth-5.4.0.dist-info/METADATA,sha256=DC_LPUW0v9Yv4LI8I7y3Eryn8F2zwavyvILcYTxEGXM,9265
+py_geth-5.4.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+py_geth-5.4.0.dist-info/top_level.txt,sha256=o8Gvkxt3xBR7BNG2p9_G1J3GnGlTrBMEhYJBdAzBWDU,5
+py_geth-5.4.0.dist-info/RECORD,,

{py_geth-5.2.1.dist-info → py_geth-5.4.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any