Skip to content

Commit

Permalink
Merge branch 'main' into fix/zkevm-config-diff
Browse files Browse the repository at this point in the history
  • Loading branch information
leovct authored Apr 26, 2024
2 parents 25992fb + 20b02a0 commit e0bc518
Show file tree
Hide file tree
Showing 20 changed files with 1,214 additions and 327 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ jobs:
yq -Y --in-place '.deploy_cdk_bridge_infra = false' params.yml
yq -Y --in-place '.deploy_zkevm_permissionless_node = false' params.yml
yq -Y --in-place '.deploy_observability = false' params.yml
yq -Y --in-place '.deploy_blutgang = false' params.yml
- name: Deploy L1
run: |
Expand Down Expand Up @@ -166,6 +167,12 @@ jobs:
kurtosis run --enclave cdk-v1 --args-file params.yml .
yq -Y --in-place '.deploy_observability = false' params.yml # reset
- name: Deploy Loadbalancer (blutgang)
run: |
yq -Y --in-place '.deploy_blutgang = true' params.yml
kurtosis run --enclave cdk-v1 --args-file params.yml .
yq -Y --in-place '.deploy_blutgang = false' params.yml # reset
- name: Check that batches are being verified
run: |
timeout_minutes="${CHECK_VERIFIED_BATCHES_TIMEOUT_MINUTES}"
Expand Down
51 changes: 51 additions & 0 deletions cdk_blutgang.star
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
def run(plan, args):
blutgang_name = "blutgang" + args["deployment_suffix"]
blutgang_config_template = read_file(
src="./templates/blutgang/blutgang-config.toml"
)

zkevm_sequencer_service = plan.get_service(name="zkevm-node-sequencer" + args["deployment_suffix"])
zkevm_sequencer_http_url = "http://{}:{}".format(zkevm_sequencer_service.ip_address, zkevm_sequencer_service.ports["rpc"].number)

zkevm_rpc_service = plan.get_service(name="zkevm-node-rpc" + args["deployment_suffix"])
zkevm_rpc_http_url = "http://{}:{}".format(zkevm_rpc_service.ip_address, zkevm_rpc_service.ports["http-rpc"].number)
zkevm_rpc_ws_url = "ws://{}:{}".format(zkevm_rpc_service.ip_address, zkevm_rpc_service.ports["ws-rpc"].number)

zkevm_rpc_pless_service = plan.get_service(name="zkevm-node-rpc-pless" + args["deployment_suffix"])
zkevm_rpc_pless_http_url = "http://{}:{}".format(zkevm_rpc_pless_service.ip_address, zkevm_rpc_pless_service.ports["http-rpc"].number)
zkevm_rpc_pless_ws_url = "ws://{}:{}".format(zkevm_rpc_pless_service.ip_address, zkevm_rpc_pless_service.ports["ws-rpc"].number)

blutgang_config_artifact = plan.render_templates(
name="blutgang-config-artifact",
config={
"blutgang-config.toml": struct(template=blutgang_config_template, data={
"l2_sequencer_url": zkevm_sequencer_http_url,
"l2_rpc_url": zkevm_rpc_http_url,
"l2_ws_url": zkevm_rpc_ws_url,
"l2_rpc_pless_url": zkevm_rpc_pless_http_url,
"l2_ws_pless_url": zkevm_rpc_pless_ws_url,
} | args)
},
)

blutgang_service_config = ServiceConfig(
image=args["blutgang_image"],
ports={
"http": PortSpec(args["blutgang_rpc_port"], application_protocol="http"),
"admin": PortSpec(args["blutgang_admin_port"], application_protocol="http"),
},
files={
"/etc/blutgang": Directory(
artifact_names=[
blutgang_config_artifact,
]
),
},
cmd=["/app/blutgang", "-c", "/etc/blutgang/blutgang-config.toml"]
)

plan.add_service(
name=blutgang_name,
config=blutgang_service_config,
description="Starting blutgang service",
)
307 changes: 0 additions & 307 deletions doc-drafts/fork-id-migration.org

This file was deleted.

2 changes: 2 additions & 0 deletions doc-drafts/ready-for-publication/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Docs in this folder are ready to be edited and meant for public
guides.
Loading

0 comments on commit e0bc518

Please sign in to comment.