Skip to content

fix: adjust for new op-deployer #250

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 2 commits into from
May 2, 2025
Merged

fix: adjust for new op-deployer #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14a49d7
fix: adjust for new op-deployer
sigma May 2, 2025
fd7d7f8
Merge branch 'main' into sigma/fix-new-op-deployer
sigma May 2, 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
2 changes: 1 addition & 1 deletion network_params.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ 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.4.0-rc.1
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_log_level: "info"
Expand Down
2 changes: 1 addition & 1 deletion src/challenger/op-challenger/launcher.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def get_challenger_config(
plan,
deployment_output,
"state",
'.opChainDeployments[] | select(.id=="{0}") | .disputeGameFactoryProxyAddress'.format(
'.opChainDeployments[] | select(.id=="{0}") | .DisputeGameFactoryProxy'.format(
util.to_hex_chain_id(first_network_id)
),
)
Expand Down
6 changes: 4 additions & 2 deletions src/contracts/contract_deployer.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,13 @@ def deploy_contracts(
"l1ContractsLocator": l1_artifacts_locator,
"l2ContractsLocator": l2_artifacts_locator,
"superchainRoles": {
"guardian": read_chain_cmd("l1ProxyAdmin", l2_chain_ids_list[0]),
"superchainGuardian": read_chain_cmd("l1ProxyAdmin", l2_chain_ids_list[0]),
"protocolVersionsOwner": read_chain_cmd(
"l1ProxyAdmin", l2_chain_ids_list[0]
),
"proxyAdminOwner": read_chain_cmd("l1ProxyAdmin", l2_chain_ids_list[0]),
"superchainProxyAdminOwner": read_chain_cmd(
"l1ProxyAdmin", l2_chain_ids_list[0]
),
},
"chains": [],
}
Expand Down
2 changes: 1 addition & 1 deletion src/l2.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def launch_l2(
plan,
deployment_output,
"state",
'.opChainDeployments[] | select(.id=="{0}") | .l1StandardBridgeProxyAddress'.format(
'.opChainDeployments[] | select(.id=="{0}") | .L1StandardBridgeProxy'.format(
network_id_as_hex
),
)
Expand Down
2 changes: 1 addition & 1 deletion src/package_io/input_parser.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ 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.4.0-rc.1",
"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(),
Expand Down
2 changes: 1 addition & 1 deletion src/participant_network.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def launch_participant_network(
plan,
deployment_output,
"state",
".opChainDeployments[{0}].disputeGameFactoryProxyAddress".format(l2_num),
".opChainDeployments[{0}].DisputeGameFactoryProxy".format(l2_num),
)
proposer_key = util.read_network_config_value(
plan,
Expand Down
Loading