Skip to content

Commit 9952361

Browse files
authored
feat: introduce devnet_repo override (ethereum#686)
1 parent 26a7618 commit 9952361

File tree

6 files changed

+20
-6
lines changed

6 files changed

+20
-6
lines changed

.github/workflows/per-pr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
"./.github/tests/mix-with-tools.yaml",
3535
"./.github/tests/mix-persistence.yaml",
3636
"./.github/tests/mix-public.yaml",
37+
"./.github/tests/minimal.yaml",
3738
"./network_params.yaml"
3839
]
3940
runs-on: ubuntu-latest

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,10 @@ network_params:
538538
# nonce: 0
539539
# secretKey: "0x"
540540

541+
# Repository override for devnet networks
542+
# Default: ethpandaops
543+
devnet_repo: ethpandaops
544+
541545
# Global parameters for the network
542546

543547
# By default includes

src/network_launcher/devnet.star

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ el_cl_genesis_data = import_module(
44
)
55

66

7-
def launch(plan, network, cancun_time, prague_time):
7+
def launch(plan, network, cancun_time, prague_time, repo):
88
# We are running a devnet
9-
url = shared_utils.calculate_devnet_url(network)
9+
url = shared_utils.calculate_devnet_url(network, repo)
1010
el_cl_genesis_uuid = plan.upload_files(
1111
src=url,
1212
name="el_cl_genesis",

src/package_io/input_parser.star

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ def input_parser(plan, input_args):
296296
additional_preloaded_contracts=result["network_params"][
297297
"additional_preloaded_contracts"
298298
],
299+
devnet_repo=result["network_params"]["devnet_repo"],
299300
),
300301
mev_params=struct(
301302
mev_relay_image=result["mev_params"]["mev_relay_image"],
@@ -795,6 +796,7 @@ def default_network_params():
795796
"target_number_of_peers": 70,
796797
"preset": "mainnet",
797798
"additional_preloaded_contracts": {},
799+
"devnet_repo": "ethpandaops",
798800
}
799801

800802

@@ -826,6 +828,7 @@ def default_minimal_network_params():
826828
"target_number_of_peers": 70,
827829
"preset": "minimal",
828830
"additional_preloaded_contracts": {},
831+
"devnet_repo": "ethpandaops",
829832
}
830833

831834

src/participant_network.star

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,13 @@ def launch_participant_network(
119119
final_genesis_timestamp,
120120
network_id,
121121
validator_data,
122-
) = launch_devnet.launch(plan, network_params.network, cancun_time, prague_time)
122+
) = launch_devnet.launch(
123+
plan,
124+
network_params.network,
125+
cancun_time,
126+
prague_time,
127+
network_params.devnet_repo,
128+
)
123129

124130
# Launch all execution layer clients
125131
all_el_contexts = el_client_launcher.launch(

src/shared_utils/shared_utils.star

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ print(int(time.time()+padding), end="")
192192
return result.output
193193

194194

195-
def calculate_devnet_url(network):
195+
def calculate_devnet_url(network, repo):
196196
sf_suffix_mapping = {"hsf": "-hsf-", "gsf": "-gsf-", "ssf": "-ssf-"}
197197
shadowfork = "sf-" in network
198198

@@ -211,8 +211,8 @@ def calculate_devnet_url(network):
211211
devnet_name.split("-")[1] + "-" if len(devnet_name.split("-")) > 1 else ""
212212
)
213213

214-
return "github.com/ethpandaops/{0}-devnets/network-configs/{1}{2}-{3}".format(
215-
devnet_category, devnet_subname, network_type, devnet_number
214+
return "github.com/{0}/{1}-devnets/network-configs/{2}{3}-{4}".format(
215+
repo, devnet_category, devnet_subname, network_type, devnet_number
216216
)
217217

218218

0 commit comments

Comments
 (0)