Skip to content

Commit 7d7b4cc

Browse files
committed
fix: update geth
1 parent 36a427e commit 7d7b4cc

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
- name: Install Geth
8888
uses: gacts/install-geth-tools@v1
8989
with:
90-
version: 1.15.6
90+
version: 1.16.4
9191

9292
- name: Setup Ape
9393
uses: ApeWorX/github-action@v3

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
"eth-typing>=3.5.2,<6",
120120
"eth-utils>=2.1.0,<6",
121121
"hexbytes>=1.2.0,<2",
122-
"py-geth>=5.4.0,<6",
122+
"py-geth>=6.2.0,<7",
123123
"trie>=3.0.1,<4", # Peer: stricter pin needed for uv support.
124124
"web3[tester]>=7.12.1,<8",
125125
# ** Dependencies maintained by ApeWorX **

src/ape_node/provider.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ def __init__(
167167
kwargs_ctor: dict = {
168168
"data_dir": self.data_dir,
169169
"geth_executable": executable[0],
170-
"network_id": f"{chain_id}",
171170
}
172171
if hostname is not None:
173172
kwargs_ctor["rpc_addr"] = hostname
@@ -199,7 +198,6 @@ def __init__(
199198
geth_kwargs = construct_test_chain_kwargs(**kwargs_ctor)
200199
if is_reth:
201200
geth_kwargs.pop("max_peers", None)
202-
geth_kwargs.pop("network_id", None)
203201
geth_kwargs.pop("no_discover", None)
204202

205203
# NOTE: --verbosity _is_ available in reth, but it is a different type (flag only).
@@ -219,6 +217,10 @@ def __init__(
219217
self._clean()
220218

221219
geth_kwargs["dev_mode"] = True
220+
221+
# Does not work with --dev mode.
222+
geth_kwargs.pop("network_id", None)
223+
222224
hd_path = hd_path or DEFAULT_TEST_HD_PATH
223225

224226
if generate_accounts:
@@ -243,6 +245,7 @@ def __init__(
243245
idx = self.command.index(executable[0])
244246
self.command = self.command[:idx] + executable + self.command[idx + 1 :]
245247

248+
246249
@classmethod
247250
def from_uri(cls, uri: str, data_folder: Path, **kwargs):
248251
mnemonic = kwargs.get("mnemonic", DEFAULT_TEST_MNEMONIC)

0 commit comments

Comments
 (0)