Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: aggsender and agglayer bump version #376

Merged
merged 9 commits into from
Nov 14, 2024
8 changes: 3 additions & 5 deletions .github/tests/fork12-pessimistic.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
args:
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.5
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta3
cdk_node_image: nulyjkdhthz/cdk:6d775da5dad55990f534e0190a89613ae64f5ccf
cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.11
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta8
zkevm_bridge_proxy_image: haproxy:3.0-bookworm
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
zkevm_bridge_ui_image: leovct/zkevm-bridge-ui:multi-network
Expand All @@ -12,5 +10,5 @@ args:
sequencer_type: erigon
erigon_strict_mode: false
zkevm_use_gas_token_contract: false
agglayer_prover_sp1_key: REDACTED
#agglayer_prover_sp1_key:
enable_normalcy: true
14 changes: 8 additions & 6 deletions agglayer.star
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ def run(plan, args):
(ports, public_ports) = get_agglayer_prover_ports(args)

prover_env_vars = {}
if args["agglayer_prover_sp1_key"] != "":

prover_env_vars["RUST_BACKTRACE"] = "1"
if "agglayer_prover_sp1_key" in args and args["agglayer_prover_sp1_key"] != None:
prover_env_vars["SP1_PRIVATE_KEY"] = args["agglayer_prover_sp1_key"]

agglayer_prover = plan.add_service(
Expand Down Expand Up @@ -76,11 +78,11 @@ def create_agglayer_prover_config_artifact(plan, args):
src="./templates/bridge-infra/agglayer-prover-config.toml"
)

is_cpu_prover_enabled = "false"
is_network_prover_enabled = "true"
if args["agglayer_prover_sp1_key"] == "":
is_cpu_prover_enabled = "true"
is_network_prover_enabled = "false"
is_cpu_prover_enabled = "true"
is_network_prover_enabled = "false"
if "agglayer_prover_sp1_key" in args and args["agglayer_prover_sp1_key"] != None:
is_cpu_prover_enabled = "false"
is_network_prover_enabled = "true"

return plan.render_templates(
name="agglayer-prover-config-artifact",
Expand Down
2 changes: 1 addition & 1 deletion input_parser.star
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ DEFAULT_ROLLUP_ARGS = {
# https://hackmd.io/@4cbvqzFdRBSWMHNeI8Wbwg/r1hKHp_S0
"enable_normalcy": False,
# If the agglayer is going to be configured to use SP1 services, we'll need to provide an API Key
"agglayer_prover_sp1_key": "",
"agglayer_prover_sp1_key": None,
# The URL where the agglayer can be reached
"agglayer_url": "http://agglayer:" + str(DEFAULT_PORTS.get("agglayer_port")),
# This is a path where the cdk-node will write data
Expand Down
14 changes: 7 additions & 7 deletions main.star
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,13 @@ def run(plan, args={}):
src="/opt/zkevm/genesis.json",
)

# Deploy the agglayer.
if deployment_stages.get("deploy_agglayer", False):
plan.print("Deploying the agglayer")
import_module(agglayer_package).run(plan, args)
else:
plan.print("Skipping the deployment of the agglayer")

# Deploy cdk central/trusted environment.
if deployment_stages.get("deploy_cdk_central_environment", False):
# Deploy cdk-erigon sequencer node.
Expand Down Expand Up @@ -117,13 +124,6 @@ def run(plan, args={}):
else:
plan.print("Skipping the deployment of cdk/bridge infrastructure")

# Deploy the agglayer.
if deployment_stages.get("deploy_agglayer", False):
plan.print("Deploying the agglayer")
import_module(agglayer_package).run(plan, args)
else:
plan.print("Skipping the deployment of the agglayer")

# Deploy contracts on L2.
if deployment_stages.get("deploy_l2_contracts", False):
plan.print("Deploying contracts on L2")
Expand Down
1 change: 1 addition & 0 deletions templates/bridge-infra/agglayer-config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ chain-id = {{.l1_chain_id}}
node-url = "{{.l1_rpc_url}}"
ws-node-url = "{{.l1_ws_url}}"
rollup-manager-contract = "{{.zkevm_rollup_manager_address}}"
polygon-zkevm-global-exit-root-v2-contract = "{{.zkevm_global_exit_root_address}}"
rpc-timeout = 45

[l2]
Expand Down