Skip to content

fix(op-deployer): allow overriding cannon vm type #249

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 5, 2025
Merged

fix(op-deployer): allow overriding cannon vm type #249

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
02d9a0a
fix(op-deployer): allow overriding cannon vm type
sigma May 2, 2025
0fbbb27
Merge branch 'main' into sigma/op-deployer-overrides
sigma May 5, 2025
ed67976
Merge branch 'main' into sigma/op-deployer-overrides
sigma May 5, 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
19 changes: 11 additions & 8 deletions src/contracts/contract_deployer.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ FACTORY_DEPLOYER_CODE = "0xf8a58085174876e800830186a08080b853604580600e600039806
FUND_SCRIPT_FILEPATH = "../../static_files/scripts"

utils = import_module("../util.star")
_filter = import_module("../util/filter.star")

ethereum_package_genesis_constants = import_module(
"github.com/ethpandaops/ethereum-package/src/prelaunch_data_generator/genesis_constants/genesis_constants.star"
Expand Down Expand Up @@ -177,19 +178,21 @@ def deploy_contracts(
}

absolute_prestate = ""
if optimism_args.op_contract_deployer_params.global_deploy_overrides[
if (
"faultGameAbsolutePrestate"
]:
absolute_prestate = (
optimism_args.op_contract_deployer_params.global_deploy_overrides[
"faultGameAbsolutePrestate"
]
)
in optimism_args.op_contract_deployer_params.overrides
):
absolute_prestate = optimism_args.op_contract_deployer_params.overrides[
"faultGameAbsolutePrestate"
]
intent["globalDeployOverrides"] = {
"dangerouslyAllowCustomDisputeParameters": True,
"faultGameAbsolutePrestate": absolute_prestate,
}

overrides = _filter.remove_none(optimism_args.op_contract_deployer_params.overrides)
vm_type = overrides.get("vmType", "CANNON")

for i, chain in enumerate(optimism_args.chains):
chain_id = str(chain.network_params.network_id)
intent_chain = dict(CANNED_VALUES)
Expand Down Expand Up @@ -226,7 +229,7 @@ def deploy_contracts(
"faultGameClockExtension": 10800,
"faultGameMaxClockDuration": 302400,
"dangerouslyAllowCustomDisputeParameters": True,
"vmType": "CANNON",
"vmType": vm_type,
"useCustomOracle": False,
"oracleMinProposalSize": 0,
"oracleChallengePeriodSeconds": 0,
Expand Down
12 changes: 2 additions & 10 deletions src/package_io/input_parser.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,7 @@ 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"
],
overrides=results["op_contract_deployer_params"]["overrides"],
),
global_log_level=results["global_log_level"],
global_node_selectors=results["global_node_selectors"],
Expand Down Expand Up @@ -674,18 +672,12 @@ 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.4.0-rc.2",
"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(),
"overrides": {},
}


Expand Down
11 changes: 7 additions & 4 deletions src/package_io/sanity_check.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,13 @@ OP_CONTRACT_DEPLOYER_PARAMS = [
"image",
"l1_artifacts_locator",
"l2_artifacts_locator",
"global_deploy_overrides",
"overrides",
]

OP_CONTRACT_DEPLOYER_GLOBAL_DEPLOY_OVERRIDES = ["faultGameAbsolutePrestate"]
OP_CONTRACT_DEPLOYER_OVERRIDES = [
"faultGameAbsolutePrestate",
"vmType",
]

ADDITIONAL_SERVICES_PARAMS = ["blockscout", "rollup-boost", "da_server", "tx_fuzzer"]

Expand Down Expand Up @@ -344,8 +347,8 @@ def sanity_check(plan, optimism_config):
validate_params(
plan,
optimism_config["op_contract_deployer_params"],
"global_deploy_overrides",
OP_CONTRACT_DEPLOYER_GLOBAL_DEPLOY_OVERRIDES,
"overrides",
OP_CONTRACT_DEPLOYER_OVERRIDES,
)

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