From c6c89e7a171ed2b883fb6488686a9026ef856b05 Mon Sep 17 00:00:00 2001
From: Michael de Hoog <michael.dehoog@coinbase.com>
Date: Thu, 3 Oct 2024 12:15:54 -1000
Subject: [PATCH] Fix deploy script

---
 script/DeploySystem.s.sol  | 15 ++++++++++++---
 src/SystemConfigGlobal.sol |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/script/DeploySystem.s.sol b/script/DeploySystem.s.sol
index f3aaf16..ea1a9e7 100644
--- a/script/DeploySystem.s.sol
+++ b/script/DeploySystem.s.sol
@@ -35,6 +35,9 @@ contract DeploySystem is Deploy {
         setupSuperchain();
         console.log("set up superchain!");
 
+        setupSystemConfigGlobal();
+        console.log("set up system config global!");
+
         setupOpChain2();
         console.log("set up op chain!");
 
@@ -42,11 +45,20 @@ contract DeploySystem is Deploy {
         console.log("set chain deploy!");
     }
 
+    function setupSystemConfigGlobal() public {
+        console.log("Setting up SystemConfigGlobal");
+
+        deployERC1967Proxy("SystemConfigGlobalProxy");
+        deploySystemConfigGlobal();
+        initializeSystemConfigGlobal();
+    }
+
     function setupOpChain2() public {
         console.log("Deploying OP Chain");
 
         // Ensure that the requisite contracts are deployed
         mustGetAddress("SuperchainConfigProxy");
+        mustGetAddress("SystemConfigGlobalProxy");
         mustGetAddress("SystemOwnerSafe");
         mustGetAddress("AddressManager");
         mustGetAddress("ProxyAdmin");
@@ -67,7 +79,6 @@ contract DeploySystem is Deploy {
 
         deployERC1967Proxy("OptimismPortalProxy");
         deployERC1967Proxy("SystemConfigProxy");
-        deployERC1967Proxy("SystemConfigGlobalProxy");
         deployL1StandardBridgeProxy();
         deployL1CrossDomainMessengerProxy();
         deployERC1967Proxy("OptimismMintableERC20FactoryProxy");
@@ -88,7 +99,6 @@ contract DeploySystem is Deploy {
         deployL1CrossDomainMessenger();
         deployOptimismMintableERC20Factory();
         deploySystemConfigOwnable();
-        deploySystemConfigGlobal();
         deployL1StandardBridge();
         deployL1ERC721Bridge();
         deployPortal();
@@ -99,7 +109,6 @@ contract DeploySystem is Deploy {
         console.log("Initializing implementations");
         initializePortal();
         initializeSystemConfigOwnable();
-        initializeSystemConfigGlobal();
         initializeL1StandardBridge();
         initializeL1ERC721Bridge();
         initializeOptimismMintableERC20Factory();
diff --git a/src/SystemConfigGlobal.sol b/src/SystemConfigGlobal.sol
index 82ff69d..3a58568 100644
--- a/src/SystemConfigGlobal.sol
+++ b/src/SystemConfigGlobal.sol
@@ -23,7 +23,7 @@ contract SystemConfigGlobal is OwnableUpgradeable, ISemver {
 
     constructor() {
         initialize({
-            _owner: address(0)
+            _owner: address(0xdEaD)
         });
     }