Skip to content

fix(cannon): update cannon vm type after type 2 was removed #247

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.

Sign up for GitHub

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

Merged
sigma merged 3 commits into from
May 1, 2025
Merged

fix(cannon): update cannon vm type after type 2 was removed #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b3aca5
fix(cannon): update cannon vm type after type 2 was removed
sigma May 1, 2025
e317a2d
fix(challenger): fix l2 rpcs computation
sigma May 1, 2025
d1412f7
fix(observability): try harder to generate unique job names
sigma May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions network_params.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down
6 changes: 4 additions & 2 deletions src/challenger/op-challenger/launcher.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
]
)
Expand All @@ -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
]
)
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/contract_deployer.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ def deploy_contracts(
"faultGameClockExtension": 10800,
"faultGameMaxClockDuration": 302400,
"dangerouslyAllowCustomDisputeParameters": True,
"vmType": "CANNON2",
"vmType": "CANNON",
"useCustomOracle": False,
"oracleMinProposalSize": 0,
"oracleChallengePeriodSeconds": 0,
Expand Down
5 changes: 4 additions & 1 deletion src/observability/observability.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions src/package_io/input_parser.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
}

Expand Down
Loading