Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 19 additions & 0 deletions src/contracts/contract_deployer.star
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,25 @@ def deploy_contracts(plan, priv_key, l1_config_env_vars, optimism_args, l1_netwo
"superchainRoles.proxyAdminOwner", "l1ProxyAdmin", l2_chain_ids_list[0]
),
]
if optimism_args.op_contract_deployer_params.global_deploy_overrides[
"faultGameAbsolutePrestate"
]:
intent_updates.extend(
[
(
"bool",
"globalDeployOverrides.dangerouslyAllowCustomDisputeParameters",
"true",
),
(
"string",
"globalDeployOverrides.faultGameAbsolutePrestate",
optimism_args.op_contract_deployer_params.global_deploy_overrides[
"faultGameAbsolutePrestate"
],
),
]
)
intent_updates.extend(
[
(
Expand Down
14 changes: 12 additions & 2 deletions src/package_io/input_parser.star
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ def input_parser(plan, input_args):
l2_artifacts_locator=results["op_contract_deployer_params"][
"l2_artifacts_locator"
],
global_deploy_overrides=results["op_contract_deployer_params"][
"global_deploy_overrides"
],
),
global_log_level=results["global_log_level"],
global_node_selectors=results["global_node_selectors"],
Expand Down Expand Up @@ -373,8 +376,8 @@ def default_challenger_params():
return {
"image": "",
"extra_params": [],
"cannon_prestate_path": "../../../static_files/prestates",
"cannon_prestates_url": "",
"cannon_prestate_path": "",
"cannon_prestates_url": "https://storage.googleapis.com/oplabs-network-data/proofs/op-program/cannon",
}


Expand Down Expand Up @@ -423,11 +426,18 @@ def default_participant():
}


def default_op_contract_deployer_global_deploy_overrides():
return {
"faultGameAbsolutePrestate": "",
}


def default_op_contract_deployer_params():
return {
"image": "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-deployer:v0.0.8",
"l1_artifacts_locator": "https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-c193a1863182092bc6cb723e523e8313a0f4b6e9c9636513927f1db74c047c15.tar.gz",
"l2_artifacts_locator": "https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-c193a1863182092bc6cb723e523e8313a0f4b6e9c9636513927f1db74c047c15.tar.gz",
"global_deploy_overrides": default_op_contract_deployer_global_deploy_overrides(),
}


Expand Down
9 changes: 9 additions & 0 deletions src/package_io/sanity_check.star
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,11 @@ OP_CONTRACT_DEPLOYER_PARAMS = [
"image",
"l1_artifacts_locator",
"l2_artifacts_locator",
"global_deploy_overrides",
]

OP_CONTRACT_DEPLOYER_GLOBAL_DEPLOY_OVERRIDES = ["faultGameAbsolutePrestate"]

ADDITIONAL_SERVICES_PARAMS = [
"blockscout",
"rollup-boost",
Expand Down Expand Up @@ -198,6 +201,12 @@ def sanity_check(plan, optimism_config):
"op_contract_deployer_params",
OP_CONTRACT_DEPLOYER_PARAMS,
)
validate_params(
plan,
optimism_config["op_contract_deployer_params"],
"global_deploy_overrides",
OP_CONTRACT_DEPLOYER_GLOBAL_DEPLOY_OVERRIDES,
)

plan.print("Sanity check for OP package passed")

Expand Down
8 changes: 0 additions & 8 deletions static_files/prestates/prestate-proof.json

This file was deleted.

Loading