py-geth 5.0.0__tar.gz → 5.0.0b1__tar.gz

{py_geth-5.0.0/py_geth.egg-info → py_geth-5.0.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-geth
-Version: 5.0.0
+Version: 5.0.0b1
 Summary: py-geth: Run Go-Ethereum as a subprocess
 Home-page: https://github.com/ethereum/py-geth
 Author: The Ethereum Foundation
@@ -20,11 +20,9 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8, <4
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: eval_type_backport>=0.1.0; python_version < "3.10"
-Requires-Dist: pydantic>=2.6.0
-Requires-Dist: requests>=2.23
 Requires-Dist: semantic-version>=2.6.0
-Requires-Dist: types-requests>=2.0.0
+Requires-Dist: pydantic>=2.6.0
+Requires-Dist: eval_type_backport>=0.1.0; python_version < "3.10"
 Requires-Dist: typing-extensions>=4.0.1
 Provides-Extra: dev
 Requires-Dist: build>=0.9.0; extra == "dev"
@@ -32,6 +30,7 @@ Requires-Dist: bumpversion>=0.5.3; extra == "dev"
 Requires-Dist: ipython; extra == "dev"
 Requires-Dist: mypy==1.10.0; extra == "dev"
 Requires-Dist: pre-commit>=3.4.0; extra == "dev"
+Requires-Dist: requests>=2.20; extra == "dev"
 Requires-Dist: tox>=4.0.0; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 Requires-Dist: wheel; extra == "dev"
@@ -166,19 +165,19 @@ the current list of supported versions.
 Installation can be done via the command line:
 
 ```bash
-$ python -m geth.install v1.14.8
+$ python -m geth.install v1.14.5
 ```
 
 Or from python using the `install_geth` function.
 
 ```python
 >>> from geth import install_geth
->>> install_geth('v1.14.8')
+>>> install_geth('v1.14.5')
 ```
 
 The installed binary can be found in the `$HOME/.py-geth` directory, under your
-home directory.  The `v1.14.8` binary would be located at
-`$HOME/.py-geth/geth-v1.14.8/bin/geth`.
+home directory.  The `v1.14.5` binary would be located at
+`$HOME/.py-geth/geth-v1.14.5/bin/geth`.
 
 ## About `DevGethProcess`
 

{py_geth-5.0.0 → py_geth-5.0.0b1}/README.md

@@ -118,19 +118,19 @@ the current list of supported versions.
 Installation can be done via the command line:
 
 ```bash
-$ python -m geth.install v1.14.8
+$ python -m geth.install v1.14.5
 ```
 
 Or from python using the `install_geth` function.
 
 ```python
 >>> from geth import install_geth
->>> install_geth('v1.14.8')
+>>> install_geth('v1.14.5')
 ```
 
 The installed binary can be found in the `$HOME/.py-geth` directory, under your
-home directory.  The `v1.14.8` binary would be located at
-`$HOME/.py-geth/geth-v1.14.8/bin/geth`.
+home directory.  The `v1.14.5` binary would be located at
+`$HOME/.py-geth/geth-v1.14.5/bin/geth`.
 
 ## About `DevGethProcess`
 

{py_geth-5.0.0 → py_geth-5.0.0b1}/geth/__init__.py

@@ -20,14 +20,3 @@ from .process import (
 )
 
 __version__ = __version("py-geth")
-
-__all__ = (
-    "install_geth",
-    "get_geth_version",
-    "InterceptedStreamsMixin",
-    "LoggingMixin",
-    "MainnetGethProcess",
-    "SepoliaGethProcess",
-    "TestnetGethProcess",
-    "DevGethProcess",
-)

{py_geth-5.0.0 → py_geth-5.0.0b1}/geth/genesis.json

@@ -24,6 +24,6 @@
     "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "gasLimit": "0x47e7c4",
     "difficulty": "0x0",
-    "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "alloc": {}
 }

{py_geth-5.0.0 → py_geth-5.0.0b1}/geth/install.py

@@ -17,13 +17,6 @@ from typing import (
     Generator,
 )
 
-import requests
-from requests.exceptions import (
-    ConnectionError,
-    HTTPError,
-    Timeout,
-)
-
 from geth.exceptions import (
     PyGethException,
     PyGethKeyError,
@@ -39,9 +32,6 @@ V1_14_2 = "v1.14.2"
 V1_14_3 = "v1.14.3"
 V1_14_4 = "v1.14.4"
 V1_14_5 = "v1.14.5"
-V1_14_6 = "v1.14.6"
-V1_14_7 = "v1.14.7"
-V1_14_8 = "v1.14.8"
 
 
 LINUX = "linux"
@@ -219,27 +209,29 @@ DOWNLOAD_SOURCE_CODE_URI_TEMPLATE = (
 )
 
 
-def download_source_code_release(identifier: str) -> None:
+def download_source_code_release(identifier: str) -> int:
     download_uri = DOWNLOAD_SOURCE_CODE_URI_TEMPLATE.format(identifier)
     source_code_archive_path = get_source_code_archive_path(identifier)
 
     ensure_parent_dir_exists(source_code_archive_path)
-    try:
-        response = requests.get(download_uri)
-        response.raise_for_status()
-        with open(source_code_archive_path, "wb") as f:
-            f.write(response.content)
-
-        print(f"Downloading source code release from {download_uri}")
 
-    except (HTTPError, Timeout, ConnectionError) as e:
-        raise PyGethException(
-            f"An error occurred while downloading from {download_uri}: {e}"
-        )
+    command = [
+        "wget",
+        download_uri,
+        "-c",  # resume previously incomplete download.
+        "-O",
+        source_code_archive_path,
+    ]
+
+    return check_subprocess_call(
+        command,
+        message=f"Downloading source code release from {download_uri}",
+    )
 
 
 def extract_source_code_release(identifier: str) -> None:
     source_code_archive_path = get_source_code_archive_path(identifier)
+
     source_code_extract_path = get_source_code_extract_path(identifier)
     ensure_path_exists(source_code_extract_path)
 
@@ -330,9 +322,7 @@ install_v1_14_2 = functools.partial(install_from_source_code_release, V1_14_2)
 install_v1_14_3 = functools.partial(install_from_source_code_release, V1_14_3)
 install_v1_14_4 = functools.partial(install_from_source_code_release, V1_14_4)
 install_v1_14_5 = functools.partial(install_from_source_code_release, V1_14_5)
-install_v1_14_6 = functools.partial(install_from_source_code_release, V1_14_6)
-install_v1_14_7 = functools.partial(install_from_source_code_release, V1_14_7)
-install_v1_14_8 = functools.partial(install_from_source_code_release, V1_14_8)
+
 
 INSTALL_FUNCTIONS = {
     LINUX: {
@@ -341,9 +331,6 @@ INSTALL_FUNCTIONS = {
         V1_14_3: install_v1_14_3,
         V1_14_4: install_v1_14_4,
         V1_14_5: install_v1_14_5,
-        V1_14_6: install_v1_14_6,
-        V1_14_7: install_v1_14_7,
-        V1_14_8: install_v1_14_8,
     },
     OSX: {
         V1_14_0: install_v1_14_0,
@@ -351,9 +338,6 @@ INSTALL_FUNCTIONS = {
         V1_14_3: install_v1_14_3,
         V1_14_4: install_v1_14_4,
         V1_14_5: install_v1_14_5,
-        V1_14_6: install_v1_14_6,
-        V1_14_7: install_v1_14_7,
-        V1_14_8: install_v1_14_8,
     },
 }
 

{py_geth-5.0.0 → py_geth-5.0.0b1}/geth/types.py

@@ -37,7 +37,6 @@ class GethKwargsTypedDict(TypedDict, total=False):
     suffix_args: list[str] | None
     suffix_kwargs: dict[str, str] | None
     tx_pool_global_slots: str | None
-    tx_pool_lifetime: str | None
     tx_pool_price_limit: str | None
     verbosity: str | None
     ws_addr: str | None
@@ -49,17 +48,12 @@ class GethKwargsTypedDict(TypedDict, total=False):
 
 class GenesisDataTypedDict(TypedDict, total=False):
     alloc: dict[str, dict[str, Any]]
-    baseFeePerGas: str
-    blobGasUsed: str
     coinbase: str
     config: dict[str, Any]
     difficulty: str
-    excessBlobGas: str
     extraData: str
     gasLimit: str
-    gasUsed: str
-    mixHash: str
+    mixhash: str
     nonce: str
-    number: str
     parentHash: str
     timestamp: str

{py_geth-5.0.0 → py_geth-5.0.0b1}/geth/utils/validation.py

@@ -46,7 +46,6 @@ class GethKwargs(BaseModel):
     suffix_args: list[str] | None = None
     suffix_kwargs: dict[str, str] | None = None
     tx_pool_global_slots: str | None = None
-    tx_pool_lifetime: str | None = None
     tx_pool_price_limit: str | None = None
     verbosity: str | None = None
     ws_addr: str | None = None
@@ -71,7 +70,6 @@ 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
@@ -99,20 +97,15 @@ class GenesisDataConfig(BaseModel):
 
 class GenesisData(BaseModel):
     alloc: dict[str, dict[str, Any]] = {}
-    baseFeePerGas: str = "0x0"
-    blobGasUsed: str = "0x0"
     coinbase: str = "0x3333333333333333333333333333333333333333"
     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"
+    mixhash: str = "0x0000000000000000000000000000000000000000000000000000000000000000"
     nonce: str = "0x0"
-    number: str = "0x0"
     parentHash: str = (
         "0x0000000000000000000000000000000000000000000000000000000000000000"
     )

{py_geth-5.0.0 → py_geth-5.0.0b1}/geth/wrapper.py

@@ -219,9 +219,6 @@ def construct_popen_command(**geth_kwargs: Unpack[GethKwargsTypedDict]) -> list[
     if gk.tx_pool_global_slots is not None:
         builder.extend(("--txpool.globalslots", gk.tx_pool_global_slots))
 
-    if gk.tx_pool_lifetime is not None:
-        builder.extend(("--txpool.lifetime", gk.tx_pool_lifetime))
-
     if gk.tx_pool_price_limit is not None:
         builder.extend(("--txpool.pricelimit", gk.tx_pool_price_limit))
 

{py_geth-5.0.0 → py_geth-5.0.0b1/py_geth.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-geth
-Version: 5.0.0
+Version: 5.0.0b1
 Summary: py-geth: Run Go-Ethereum as a subprocess
 Home-page: https://github.com/ethereum/py-geth
 Author: The Ethereum Foundation
@@ -20,11 +20,9 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8, <4
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: eval_type_backport>=0.1.0; python_version < "3.10"
-Requires-Dist: pydantic>=2.6.0
-Requires-Dist: requests>=2.23
 Requires-Dist: semantic-version>=2.6.0
-Requires-Dist: types-requests>=2.0.0
+Requires-Dist: pydantic>=2.6.0
+Requires-Dist: eval_type_backport>=0.1.0; python_version < "3.10"
 Requires-Dist: typing-extensions>=4.0.1
 Provides-Extra: dev
 Requires-Dist: build>=0.9.0; extra == "dev"
@@ -32,6 +30,7 @@ Requires-Dist: bumpversion>=0.5.3; extra == "dev"
 Requires-Dist: ipython; extra == "dev"
 Requires-Dist: mypy==1.10.0; extra == "dev"
 Requires-Dist: pre-commit>=3.4.0; extra == "dev"
+Requires-Dist: requests>=2.20; extra == "dev"
 Requires-Dist: tox>=4.0.0; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 Requires-Dist: wheel; extra == "dev"
@@ -166,19 +165,19 @@ the current list of supported versions.
 Installation can be done via the command line:
 
 ```bash
-$ python -m geth.install v1.14.8
+$ python -m geth.install v1.14.5
 ```
 
 Or from python using the `install_geth` function.
 
 ```python
 >>> from geth import install_geth
->>> install_geth('v1.14.8')
+>>> install_geth('v1.14.5')
 ```
 
 The installed binary can be found in the `$HOME/.py-geth` directory, under your
-home directory.  The `v1.14.8` binary would be located at
-`$HOME/.py-geth/geth-v1.14.8/bin/geth`.
+home directory.  The `v1.14.5` binary would be located at
+`$HOME/.py-geth/geth-v1.14.5/bin/geth`.
 
 ## About `DevGethProcess`
 

{py_geth-5.0.0 → py_geth-5.0.0b1}/py_geth.egg-info/SOURCES.txt

@@ -37,10 +37,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.0.0 → py_geth-5.0.0b1}/py_geth.egg-info/requires.txt

@@ -1,7 +1,5 @@
-pydantic>=2.6.0
-requests>=2.23
 semantic-version>=2.6.0
-types-requests>=2.0.0
+pydantic>=2.6.0
 typing-extensions>=4.0.1
 
 [:python_version < "3.10"]
@@ -13,6 +11,7 @@ bumpversion>=0.5.3
 ipython
 mypy==1.10.0
 pre-commit>=3.4.0
+requests>=2.20
 tox>=4.0.0
 twine
 wheel

{py_geth-5.0.0 → py_geth-5.0.0b1}/setup.py

@@ -11,6 +11,7 @@ extras_require = {
         "ipython",
         "mypy==1.10.0",
         "pre-commit>=3.4.0",
+        "requests>=2.20",
         "tox>=4.0.0",
         "twine",
         "wheel",
@@ -37,7 +38,7 @@ with open("./README.md") as readme:
 setup(
     name="py-geth",
     # *IMPORTANT*: Don't manually change the version here. Use the 'bumpversion' utility.
-    version="5.0.0",
+    version="5.0.0-beta.1",
     description="""py-geth: Run Go-Ethereum as a subprocess""",
     long_description_content_type="text/markdown",
     long_description=long_description,
@@ -47,11 +48,9 @@ setup(
     include_package_data=True,
     py_modules=["geth"],
     install_requires=[
-        "eval_type_backport>=0.1.0; python_version < '3.10'",
-        "pydantic>=2.6.0",
-        "requests>=2.23",
         "semantic-version>=2.6.0",
-        "types-requests>=2.0.0",
+        "pydantic>=2.6.0",
+        "eval_type_backport>=0.1.0; python_version < '3.10'",
         "typing-extensions>=4.0.1",
     ],
     python_requires=">=3.8, <4",

py_geth-5.0.0b1/tests/core/accounts/projects/test-01/geth/nodekey

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

py_geth-5.0.0b1/tests/core/accounts/projects/test-02/geth/nodekey

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

py_geth-5.0.0b1/tests/core/accounts/projects/test-03/geth/nodekey

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

{py_geth-5.0.0 → py_geth-5.0.0b1}/tests/core/utility/test_validation.py

@@ -104,11 +104,8 @@ def test_validate_genesis_data_bad(genesis_data):
             },
             {
                 "alloc": {},
-                "baseFeePerGas": "0x0",
-                "blobGasUsed": "0x0",
                 "coinbase": "0x3333333333333333333333333333333333333333",
                 "config": {
-                    "chainId": 0,
                     "ethash": {},
                     "homesteadBlock": 0,
                     "daoForkBlock": 0,
@@ -130,13 +127,10 @@ def test_validate_genesis_data_bad(genesis_data):
                     "cancunTime": 0,
                 },
                 "difficulty": "0x00012131",
-                "excessBlobGas": "0x0",
                 "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
                 "gasLimit": "0x47e7c4",
-                "gasUsed": "0x0",
-                "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
+                "mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
                 "nonce": "abc",
-                "number": "0x0",
                 "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
                 "timestamp": "1234",
             },
@@ -156,11 +150,8 @@ def test_validate_genesis_data_bad(genesis_data):
             },
             {
                 "alloc": {},
-                "baseFeePerGas": "0x0",
-                "blobGasUsed": "0x0",
                 "coinbase": "0x3333333333333333333333333333333333333333",
                 "config": {
-                    "chainId": 0,
                     "ethash": {},
                     "homesteadBlock": 5,
                     "daoForkBlock": 1,
@@ -182,13 +173,10 @@ def test_validate_genesis_data_bad(genesis_data):
                     "cancunTime": 0,
                 },
                 "difficulty": "0x00012131",
-                "excessBlobGas": "0x0",
                 "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
                 "gasLimit": "0x47e7c4",
-                "gasUsed": "0x0",
-                "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
+                "mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
                 "nonce": "abc",
-                "number": "0x0",
                 "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",  # noqa: E501
                 "timestamp": "0x0",
             },