From 14a49d772276bf61e9e6105c002de56ad5d0860f Mon Sep 17 00:00:00 2001
From: Yann Hodique <yann@oplabs.co>
Date: Fri, 2 May 2025 21:29:54 +0200
Subject: [PATCH] fix: adjust for new op-deployer

---
 network_params.yaml                        | 2 +-
 src/challenger/op-challenger/launcher.star | 2 +-
 src/contracts/contract_deployer.star       | 6 ++++--
 src/l2.star                                | 2 +-
 src/package_io/input_parser.star           | 2 +-
 src/participant_network.star               | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/network_params.yaml b/network_params.yaml
index 1ada763e..b75d0081 100644
--- a/network_params.yaml
+++ b/network_params.yaml
@@ -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"
diff --git a/src/challenger/op-challenger/launcher.star b/src/challenger/op-challenger/launcher.star
index 2ab3bfae..6250e652 100644
--- a/src/challenger/op-challenger/launcher.star
+++ b/src/challenger/op-challenger/launcher.star
@@ -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)
         ),
     )
diff --git a/src/contracts/contract_deployer.star b/src/contracts/contract_deployer.star
index ec704b47..b85896a7 100644
--- a/src/contracts/contract_deployer.star
+++ b/src/contracts/contract_deployer.star
@@ -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": [],
     }
diff --git a/src/l2.star b/src/l2.star
index 96aa2502..9aaaca69 100644
--- a/src/l2.star
+++ b/src/l2.star
@@ -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
         ),
     )
diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star
index 91ca78ba..2ebc3fdf 100644
--- a/src/package_io/input_parser.star
+++ b/src/package_io/input_parser.star
@@ -681,7 +681,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(),
diff --git a/src/participant_network.star b/src/participant_network.star
index 048ee5aa..ccfad7bb 100644
--- a/src/participant_network.star
+++ b/src/participant_network.star
@@ -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,