From 4b3aca565a18d02364914f0fe9b4a672c4b533ae Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Thu, 1 May 2025 22:57:14 +0200 Subject: [PATCH 1/3] fix(cannon): update cannon vm type after type 2 was removed --- src/contracts/contract_deployer.star | 2 +- src/package_io/input_parser.star | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/contracts/contract_deployer.star b/src/contracts/contract_deployer.star index 6d4852ec..ec704b47 100644 --- a/src/contracts/contract_deployer.star +++ b/src/contracts/contract_deployer.star @@ -224,7 +224,7 @@ def deploy_contracts( "faultGameClockExtension": 10800, "faultGameMaxClockDuration": 302400, "dangerouslyAllowCustomDisputeParameters": True, - "vmType": "CANNON2", + "vmType": "CANNON", "useCustomOracle": False, "oracleMinProposalSize": 0, "oracleChallengePeriodSeconds": 0, diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index d10d9361..91ca78ba 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -681,9 +681,9 @@ def default_op_contract_deployer_global_deploy_overrides(): def default_op_contract_deployer_params(): return { - "image": "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-deployer:v0.3.0-rc.5", - "l1_artifacts_locator": "https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-fffcbb0ebf7f83311791534a41e65ef90df47797f9ca8f86941452f597f7128c.tar.gz", - "l2_artifacts_locator": "https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-fffcbb0ebf7f83311791534a41e65ef90df47797f9ca8f86941452f597f7128c.tar.gz", + "image": "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-deployer:v0.4.0-rc.1", + "l1_artifacts_locator": "https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-02024c5a26c16fc1a5c716fff1c46b5bf7f23890d431bb554ddbad60971211d4.tar.gz", + "l2_artifacts_locator": "https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-02024c5a26c16fc1a5c716fff1c46b5bf7f23890d431bb554ddbad60971211d4.tar.gz", "global_deploy_overrides": default_op_contract_deployer_global_deploy_overrides(), } From e317a2d404310a78c526a803a4ec380ab8a7c37a Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Thu, 1 May 2025 23:14:32 +0200 Subject: [PATCH 2/3] fix(challenger): fix l2 rpcs computation --- network_params.yaml | 6 +++--- src/challenger/op-challenger/launcher.star | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/network_params.yaml b/network_params.yaml index caa12b2b..1ada763e 100644 --- a/network_params.yaml +++ b/network_params.yaml @@ -45,9 +45,9 @@ optimism_package: tx_fuzzer_params: tx_fuzzer_extra_args: [] op_contract_deployer_params: - image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-deployer:v0.3.0-rc.5 - l1_artifacts_locator: https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-fffcbb0ebf7f83311791534a41e65ef90df47797f9ca8f86941452f597f7128c.tar.gz - l2_artifacts_locator: https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-fffcbb0ebf7f83311791534a41e65ef90df47797f9ca8f86941452f597f7128c.tar.gz + image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-deployer:v0.4.0-rc.1 + l1_artifacts_locator: https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-02024c5a26c16fc1a5c716fff1c46b5bf7f23890d431bb554ddbad60971211d4.tar.gz + l2_artifacts_locator: https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-02024c5a26c16fc1a5c716fff1c46b5bf7f23890d431bb554ddbad60971211d4.tar.gz global_log_level: "info" global_node_selectors: {} global_tolerations: [] diff --git a/src/challenger/op-challenger/launcher.star b/src/challenger/op-challenger/launcher.star index df375e2a..2ab3bfae 100644 --- a/src/challenger/op-challenger/launcher.star +++ b/src/challenger/op-challenger/launcher.star @@ -119,7 +119,8 @@ def get_challenger_config( "--l2-eth-rpc={}".format( ",".join( [ - ",".join([p.el_context.rpc_http_url for p in l2.participants]) + # TODO: we need to handle multiple participants better + l2.participants[0].el_context.rpc_http_url for l2 in l2s ] ) @@ -128,7 +129,8 @@ def get_challenger_config( "--rollup-rpc={}".format( ",".join( [ - ",".join([p.cl_context.beacon_http_url for p in l2.participants]) + # TODO: we need to handle multiple participants better + l2.participants[0].cl_context.beacon_http_url for l2 in l2s ] ) From d1412f7f4643559c7349f7f1a2b9dbf93dfb8ab6 Mon Sep 17 00:00:00 2001 From: Yann Hodique Date: Thu, 1 May 2025 23:43:51 +0200 Subject: [PATCH 3/3] fix(observability): try harder to generate unique job names --- src/observability/observability.star | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/observability/observability.star b/src/observability/observability.star index 212210e3..d684716f 100644 --- a/src/observability/observability.star +++ b/src/observability/observability.star @@ -107,15 +107,18 @@ def register_service_metrics_job( "service": service_name, "namespace": service_name, } + + job_name = service_name if network_name != None: labels["stack_optimism_io_network"] = network_name + job_name += "-" + network_name labels.update(additional_labels) add_metrics_job( helper, new_metrics_job( - job_name=service_name, + job_name=job_name, endpoint=endpoint, metrics_path=metrics_path, labels=labels,