Skip to content

Commit

Permalink
feat: add optimism repo as submodule to build da-server image
Browse files Browse the repository at this point in the history
  • Loading branch information
samlaf committed Sep 23, 2024
1 parent 263df77 commit e709d7c
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "optimism"]
path = optimism
url = [email protected]:ethereum-optimism/optimism.git
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ optimism_package:
# Configuration place for da-server - https://github.com/ethereum-optimism/optimism/tree/develop/op-alt-da
da_server_params:
image: us-docker.pkg.dev/oplabs-tools-artifacts/images/da-server:dev
build_image: true
# A list of optional extra params that will be passed to the da-server container for modifying its behaviour
da_server_extra_args: []
generic_commitment: false
Expand Down
6 changes: 5 additions & 1 deletion network_params.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ optimism_package:
- el_type: op-nethermind
- el_type: op-besu
additional_services:
- blockscout
- da_server
# - blockscout
da_server_params:
image: us-docker.pkg.dev/oplabs-tools-artifacts/images/da-server:dev
build_image: True
op_contract_deployer_params:
image: ethpandaops/optimism-contract-deployer:develop
1 change: 1 addition & 0 deletions optimism
Submodule optimism added at 90700b
14 changes: 13 additions & 1 deletion src/l2.star
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,23 @@ def launch_l2(
# because op-node and op-batcher need to know the da-server url, if present
da_server_context = da_server_launcher.disabled_da_server_context()
if "da_server" in args_with_right_defaults.additional_services:
da_server_image = args_with_right_defaults.da_server_params.image
if args_with_right_defaults.da_server_params.build_image:
plan.print("Building da-server image")
da_server_image = ImageBuildSpec(
image_name=args_with_right_defaults.da_server_params.image,
# TODO: this doesn't work... because can't point to a dir outside of the kurtosis package
# also can't install optimism monorepo as a submodule because that makes the kurtosis package > 100MB, which is not allowed.
# Not sure how to fix this... detailed problem in https://github.com/ethpandaops/optimism-package/issues/72
build_context_dir="/optimism/ops/docker/op-stack-go",
target_stage="da-server-target",
)
plan.print("Successfully built da-server image")
plan.print("Launching da-server")
da_server_context = da_server_launcher.launch(
plan,
"da-server{0}".format(l2_services_suffix),
args_with_right_defaults.da_server_params.image,
da_server_image,
args_with_right_defaults.da_server_params.da_server_extra_args,
args_with_right_defaults.da_server_params.generic_commitment,
)
Expand Down
8 changes: 5 additions & 3 deletions src/package_io/input_parser.star
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ DEFAULT_PROPOSER_IMAGES = {
}

DEFAULT_DA_SERVER_IMAGES = {
# TODO: latest tag is super outdated, and doesn't have the --generic-commitment flag
# the latest v0.1.0-rc.1 image from June doesn't run on macos...
"da-server": "us-docker.pkg.dev/oplabs-tools-artifacts/images/da-server:latest",
# latest tag is super outdated, and doesn't have the --generic-commitment flag
# so we use the dev tag as default, which requires building locally (see default_da_server_params)
"da-server": "us-docker.pkg.dev/oplabs-tools-artifacts/images/da-server:dev",
}

ATTR_TO_BE_SKIPPED_AT_ROOT = (
Expand Down Expand Up @@ -82,6 +82,7 @@ def input_parser(plan, input_args):
da_server_params=struct(
enabled=result["da_server_params"]["enabled"],
image=result["da_server_params"]["image"],
build_image=result["da_server_params"]["build_image"],
da_server_extra_args=result["da_server_params"]["da_server_extra_args"],
generic_commitment=result["da_server_params"]["generic_commitment"],
),
Expand Down Expand Up @@ -188,6 +189,7 @@ def default_da_server_params():
return {
"enabled": False,
"image": DEFAULT_DA_SERVER_IMAGES["da-server"],
"build_image": True,
"da_server_extra_args": [],
"generic_commitment": False,
}
6 changes: 6 additions & 0 deletions src/package_io/sanity_check.star
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ SUBCATEGORY_PARAMS = {
"interop_time_offset",
],
"op_contract_deployer_params": ["image"],
"da_server_params": [
"image",
"build_image",
"da_server_extra_args",
"generic_commitment",
],
}

ADDITIONAL_SERVICES_PARAMS = [
Expand Down

0 comments on commit e709d7c

Please sign in to comment.