Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ethereum-package
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
ethereum-package
Commits
99523611
Unverified
Commit
99523611
authored
Jun 20, 2024
by
Barnabas Busa
Committed by
GitHub
Jun 20, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: introduce devnet_repo override (#686)
parent
26a76187
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
6 deletions
+20
-6
per-pr.yml
.github/workflows/per-pr.yml
+1
-0
README.md
README.md
+4
-0
devnet.star
src/network_launcher/devnet.star
+2
-2
input_parser.star
src/package_io/input_parser.star
+3
-0
participant_network.star
src/participant_network.star
+7
-1
shared_utils.star
src/shared_utils/shared_utils.star
+3
-3
No files found.
.github/workflows/per-pr.yml
View file @
99523611
...
@@ -34,6 +34,7 @@ jobs:
...
@@ -34,6 +34,7 @@ jobs:
"
./.github/tests/mix-with-tools.yaml"
,
"
./.github/tests/mix-with-tools.yaml"
,
"
./.github/tests/mix-persistence.yaml"
,
"
./.github/tests/mix-persistence.yaml"
,
"
./.github/tests/mix-public.yaml"
,
"
./.github/tests/mix-public.yaml"
,
"
./.github/tests/minimal.yaml"
,
"
./network_params.yaml"
"
./network_params.yaml"
]
]
runs-on
:
ubuntu-latest
runs-on
:
ubuntu-latest
...
...
README.md
View file @
99523611
...
@@ -538,6 +538,10 @@ network_params:
...
@@ -538,6 +538,10 @@ network_params:
# nonce: 0
# nonce: 0
# secretKey: "0x"
# secretKey: "0x"
# Repository override for devnet networks
# Default: ethpandaops
devnet_repo
:
ethpandaops
# Global parameters for the network
# Global parameters for the network
# By default includes
# By default includes
...
...
src/network_launcher/devnet.star
View file @
99523611
...
@@ -4,9 +4,9 @@ el_cl_genesis_data = import_module(
...
@@ -4,9 +4,9 @@ el_cl_genesis_data = import_module(
)
)
def launch(plan, network, cancun_time, prague_time):
def launch(plan, network, cancun_time, prague_time
, repo
):
# We are running a devnet
# We are running a devnet
url = shared_utils.calculate_devnet_url(network)
url = shared_utils.calculate_devnet_url(network
, repo
)
el_cl_genesis_uuid = plan.upload_files(
el_cl_genesis_uuid = plan.upload_files(
src=url,
src=url,
name="el_cl_genesis",
name="el_cl_genesis",
...
...
src/package_io/input_parser.star
View file @
99523611
...
@@ -296,6 +296,7 @@ def input_parser(plan, input_args):
...
@@ -296,6 +296,7 @@ def input_parser(plan, input_args):
additional_preloaded_contracts=result["network_params"][
additional_preloaded_contracts=result["network_params"][
"additional_preloaded_contracts"
"additional_preloaded_contracts"
],
],
devnet_repo=result["network_params"]["devnet_repo"],
),
),
mev_params=struct(
mev_params=struct(
mev_relay_image=result["mev_params"]["mev_relay_image"],
mev_relay_image=result["mev_params"]["mev_relay_image"],
...
@@ -795,6 +796,7 @@ def default_network_params():
...
@@ -795,6 +796,7 @@ def default_network_params():
"target_number_of_peers": 70,
"target_number_of_peers": 70,
"preset": "mainnet",
"preset": "mainnet",
"additional_preloaded_contracts": {},
"additional_preloaded_contracts": {},
"devnet_repo": "ethpandaops",
}
}
...
@@ -826,6 +828,7 @@ def default_minimal_network_params():
...
@@ -826,6 +828,7 @@ def default_minimal_network_params():
"target_number_of_peers": 70,
"target_number_of_peers": 70,
"preset": "minimal",
"preset": "minimal",
"additional_preloaded_contracts": {},
"additional_preloaded_contracts": {},
"devnet_repo": "ethpandaops",
}
}
...
...
src/participant_network.star
View file @
99523611
...
@@ -119,7 +119,13 @@ def launch_participant_network(
...
@@ -119,7 +119,13 @@ def launch_participant_network(
final_genesis_timestamp,
final_genesis_timestamp,
network_id,
network_id,
validator_data,
validator_data,
) = launch_devnet.launch(plan, network_params.network, cancun_time, prague_time)
) = launch_devnet.launch(
plan,
network_params.network,
cancun_time,
prague_time,
network_params.devnet_repo,
)
# Launch all execution layer clients
# Launch all execution layer clients
all_el_contexts = el_client_launcher.launch(
all_el_contexts = el_client_launcher.launch(
...
...
src/shared_utils/shared_utils.star
View file @
99523611
...
@@ -192,7 +192,7 @@ print(int(time.time()+padding), end="")
...
@@ -192,7 +192,7 @@ print(int(time.time()+padding), end="")
return result.output
return result.output
def calculate_devnet_url(network):
def calculate_devnet_url(network
, repo
):
sf_suffix_mapping = {"hsf": "-hsf-", "gsf": "-gsf-", "ssf": "-ssf-"}
sf_suffix_mapping = {"hsf": "-hsf-", "gsf": "-gsf-", "ssf": "-ssf-"}
shadowfork = "sf-" in network
shadowfork = "sf-" in network
...
@@ -211,8 +211,8 @@ def calculate_devnet_url(network):
...
@@ -211,8 +211,8 @@ def calculate_devnet_url(network):
devnet_name.split("-")[1] + "-" if len(devnet_name.split("-")) > 1 else ""
devnet_name.split("-")[1] + "-" if len(devnet_name.split("-")) > 1 else ""
)
)
return "github.com/
ethpandaops/{0}-devnets/network-configs/{1}{2}-{3
}".format(
return "github.com/
{0}/{1}-devnets/network-configs/{2}{3}-{4
}".format(
devnet_category, devnet_subname, network_type, devnet_number
repo,
devnet_category, devnet_subname, network_type, devnet_number
)
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment