Skip to content

Commit 09ded2a

Browse files
authored
fix: geth network id cant be set with public networks (#1005)
Fix for: ethereum/go-ethereum@51b34ef
1 parent 1d4e943 commit 09ded2a

8 files changed

+54
-102
lines changed

.github/tests/holesky-shadowfork.yaml_norun

Lines changed: 0 additions & 12 deletions
This file was deleted.

.github/tests/hoodi-shadowfork.yaml_norun

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ participants:
55
- el_type: reth
66
- el_type: erigon
77
network_params:
8-
electra_fork_epoch: 0
98
fulu_fork_epoch: 10
109
network: hoodi-shadowfork
1110
additional_services:

.github/tests/minimal-mev-rs.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@ participants:
1313
cl_type: grandine
1414
network_params:
1515
preset: minimal
16-
seconds_per_slot: 6
1716
additional_services:
1817
- dora
19-
- tx_fuzz
20-
- apache
18+
- spamoor
2119

2220
mev_type: mev-rs
2321

.github/tests/minimal-pectra-devnet-5.yaml.norun

Lines changed: 0 additions & 40 deletions
This file was deleted.

.github/tests/mock-mev-pectra-devnet-5.yaml.norun

Lines changed: 0 additions & 45 deletions
This file was deleted.

.github/tests/peerdas-devnet-7.yaml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
participants_matrix:
2+
el:
3+
- el_type: nethermind
4+
el_image: ethpandaops/nethermind:feature-peerdas
5+
- el_type: reth
6+
el_image: ethpandaops/reth:rkrasiuk-peerdas
7+
- el_type: geth
8+
el_image: ethpandaops/geth:marius-engine-getblobs-v2
9+
cl:
10+
- cl_type: teku
11+
cl_image: ethpandaops/teku:das
12+
supernode: true
13+
- cl_type: nimbus
14+
cl_image: ethpandaops/nimbus-eth2:gbv2
15+
supernode: true
16+
- cl_type: grandine
17+
cl_image: ethpandaops/grandine:hangleang-peerdas-devnet-7
18+
supernode: true
19+
cl_extra_env_vars: {"RUST_MIN_STACK": "5242880"}
20+
- cl_type: prysm
21+
cl_image: ethpandaops/prysm-beacon-chain:peerDAS
22+
supernode: true
23+
# - cl_type: lighthouse
24+
# cl_image: ethpandaops/lighthouse
25+
# supernode: true
26+
- cl_type: lodestar
27+
cl_image: ethpandaops/lodestar:peerDAS
28+
supernode: true
29+
30+
network_params:
31+
fulu_fork_epoch: 1
32+
max_blobs_per_block_fulu: 9
33+
target_blobs_per_block_fulu: 6
34+
additional_services:
35+
- dora
36+
- spamoor
37+
38+
spamoor_params:
39+
image: ethpandaops/spamoor:latest
40+
max_mem: 4000
41+
spammers:
42+
- scenario: eoatx
43+
config:
44+
throughput: 200
45+
- scenario: blobs
46+
config:
47+
throughput: 20

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,7 @@ network_params:
580580
data_column_sidecar_subnet_count: 128
581581
# Number of DataColumn random samples a node queries per slot
582582
samples_per_slot: 8
583+
583584
# Minimum number of subnets an honest node custodies and serves samples from
584585
# Defaults to 4
585586
custody_requirement: 4

src/el/geth/geth_launcher.star

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,11 @@ def get_config(
187187
if network_params.network in constants.PUBLIC_NETWORKS
188188
else ""
189189
),
190-
"--networkid={0}".format(launcher.networkid),
190+
"{0}".format(
191+
"--networkid={0}".format(launcher.networkid)
192+
if network_params.network not in constants.PUBLIC_NETWORKS
193+
else ""
194+
),
191195
"--verbosity=" + log_level,
192196
"--datadir=" + EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER,
193197
"--http",

0 commit comments

Comments
 (0)