devent to alpha, batcher proposer upgrade scripts, styling (#114)

Author: anikaraghu

README.md

@@ -1,4 +1,4 @@
-NETWORK=goerli-devnet
+NETWORK=goerli-alpha
 L1_RPC_URL=https://nodes-proxy-development.cbhq.net/geth/testnet-archive-goerli-lighthouse
 L2_RPC_URL=https://base-goerli-alpha.cbhq.net
 L2_CHAIN_ID=11763071

goerli-devnet/.env renamed to goerli-alpha/.env

@@ -1,4 +1,4 @@
-NETWORK=sepolia-devnet
+NETWORK=sepolia-alpha
 L1_RPC_URL=https://ethereum-full-sepolia-k8s-dev.cbhq.net
 L2_RPC_URL=https://base-sepolia-alpha.cbhq.net
 L1_CHAIN_ID=11155111

goerli-devnet/2023-05-18-deploy/.env renamed to goerli-alpha/2023-05-18-deploy/.env

@@ -8,9 +8,9 @@ import "@base-contracts/script/universal/MultisigBuilder.sol";
 
 // TODO: alternatively, can use NestedMultisigBuilder if existing owner is nested safe
 contract TransferOwner is MultisigBuilder {
-    // address constant internal PROXY_CONTRACT = <TODO: fill in address of Proxy contract which is changing ownership>; 
-    // address constant internal OLD_OWNER = <TODO: fill in existing owner address>;
-    // address constant internal NEW_OWNER = <TODO: fill in new owner address>;
+    address constant internal PROXY_CONTRACT = vm.envAddress("PROXY_CONTRACT"); // TODO: define PROXY_CONTRACT=xxx in the .env file which is the Proxy contract changing ownership
+    address constant internal OLD_OWNER = vm.envAddress("OLD_OWNER"); // TODO: define existing owner as OLD_OWNER=xxx in the .env file
+    address constant internal NEW_OWNER = vm.envAddress("NEW_OWNER"); // TODO: define new owner as NEW_OWNER=xxx in the .env file
 
     function _postCheck() internal override view {
         ProxyAdmin proxyAdmin = ProxyAdmin(PROXY_CONTRACT);

goerli-devnet/2023-05-18-deploy/Makefile renamed to goerli-alpha/2023-05-18-deploy/Makefile

@@ -6,16 +6,10 @@ import "@base-contracts/src/Challenger1of2.sol";
 import "@base-contracts/script/universal/MultisigBuilder.sol";
 
 contract DeleteL2Outputs is MultisigBuilder {
-    // address constant internal L2_OUTPUT_ORACLE_PROXY = <TODO: insert L2OutputOracleProxy address>;
-    //      mainnet value: 0x56315b90c40730925ec5485cf004d835058518A0
-    //      goerli value: 0x2A35891ff30313CcFa6CE88dcf3858bb075A2298
-    // address constant internal CHALLENGER = <TODO: insert challenger contract address>;
-    //      mainnet value: TBD
-    //      goerli value: 0xf30b40411c4d76228092E7eCdc1593c996b13D22
-    // address constant internal SAFE = <TODO: insert multisig which is signer on challenger>;
-    //      mainnet value: 0x14536667Cd30e52C0b458BaACcB9faDA7046E056
-    //      goerli value: 0x4C35Ca57616E0d5fD808574772f632D8dA4eadCa
-    // uint256 constant internal L2_OUTPUT_INDEX = <TODO: insert l2OuputIndex to start deleting from - everything after will be deleted>;
+    address constant internal L2_OUTPUT_ORACLE_PROXY = vm.envAddress("L2_OUTPUT_ORACLE_PROXY"); // TODO: define L2_OUTPUT_ORACLE_PROXY=xxx in the .env file
+    address constant internal CHALLENGER = vm.envAddress("CHALLENGER"); // TODO: define CHALLENGER=xxx in the .env file
+    address constant internal SAFE = vm.envAddress("SAFE"); // TODO: define SAFE=xxx in the .env file - ie the multisig which is signer on challenger>
+    uint256 constant internal L2_OUTPUT_INDEX = vm.envAddress("L2_OUTPUT_INDEX"); // TODO: define L2_OUTPUT_INDEX=xxx in the .env file - this is the index start deleting from (everything after will be deleted)
 
     function _postCheck() internal override view {
         L2OutputOracle l2OutputOracle = L2OutputOracle(L2_OUTPUT_ORACLE_PROXY);

goerli-devnet/2023-05-18-deploy/deployed/addresses.json renamed to goerli-alpha/2023-05-18-deploy/deployed/addresses.json

@@ -5,12 +5,8 @@ import "@base-contracts/script/universal/MultisigBuilder.sol";
 import "@eth-optimism-bedrock/contracts/L1/OptimismPortal.sol";
 
 contract PausePortal is MultisigBuilder {
-    // address constant internal OPTIMISM_PORTAL_PROXY = <TODO: insert OptimismPortalProxy address>;
-    //      mainnet value: 0x49048044D57e1C92A77f79988d21Fa8fAF74E97e
-    //      goerli value: 0xe93c8cD0D409341205A592f8c4Ac1A5fe5585cfA
-    // address constant internal GUARDIAN = <TODO: insert multisig which is Guardian address>;
-    //      mainnet value: 0x14536667Cd30e52C0b458BaACcB9faDA7046E056
-    //      goerli value: 0x4C35Ca57616E0d5fD808574772f632D8dA4eadCa
+    address constant internal OPTIMISM_PORTAL_PROXY = vm.envAddress("OPTIMISM_PORTAL_PROXY"); // TODO: define OPTIMISM_PORTAL_PROXY=xxx in the .env file
+    address constant internal GUARDIAN = vm.envAddress("GUARDIAN"); // TODO: define GUARDIAN=xxx in the .env file
 
     function _postCheck() internal override view {
         OptimismPortal optimismPortal = OptimismPortal(payable(OPTIMISM_PORTAL_PROXY));

goerli-devnet/2023-05-18-deploy/execute/RunDeployBedrock.s.sol renamed to goerli-alpha/2023-05-18-deploy/execute/RunDeployBedrock.s.sol

@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import "@eth-optimism-bedrock/src/L1/SystemConfig.sol";
+import "@base-contracts/script/universal/MultisigBuilder.sol";
+
+contract SetBatcherAddr is MultisigBuilder {
+    address constant internal NEW_BATCHER = vm.envAddress("NEW_BATCHER_ADDR"); // TODO: define NEW_BATCHER_ADDR=xxx in the .env file
+    address constant internal SYSTEM_CONFIG = vm.envAddress("SYSTEM_CONFIG_ADDR"); // TODO: define SYSTEM_CONFIG_ADDR=xxx in the .env file
+    address internal SYSTEM_CONFIG_OWNER = vm.envAddress("SYSTEM_CONFIG_OWNER"); // TODO: define SYSTEM_CONFIG_OWNER=xxx in the .env file
+
+
+    function _postCheck() internal override view {
+        SystemConfig systemConfig = SystemConfig(SYSTEM_CONFIG);
+        bytes32 batcherHash = bytes32(abi.encode(NEW_BATCHER));
+        require(systemConfig.batcherHash() == batcherHash, "SetBatcherAddr: batcherHash not set correctly");
+    }
+
+    function _buildCalls() internal override view returns (IMulticall3.Call3[] memory) {
+        IMulticall3.Call3[] memory calls = new IMulticall3.Call3[](1);
+
+        bytes32 batcherHash = bytes32(abi.encode(NEW_BATCHER));
+
+        calls[0] = IMulticall3.Call3({
+            target: SYSTEM_CONFIG,
+            allowFailure: false,
+            callData: abi.encodeCall(
+                SystemConfig.setBatcherHash,
+                (batcherHash)
+            )
+        });
+
+        return calls;
+    }
+
+    function _ownerSafe() internal override view returns (address) {
+        return SYSTEM_CONFIG_OWNER;
+    }
+}

goerli-devnet/2023-05-18-deploy/execute/Utils.sol renamed to goerli-alpha/2023-05-18-deploy/execute/Utils.sol

@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import "@eth-optimism-bedrock/contracts/L1/L2OutputOracle.sol";
+import "forge-std/Script.sol";
+
+contract SetupNewProposer is Script {
+    address constant internal NEW_PROPOSER = vm.envUint("NEW_PROPOSER"); // TODO: define NEW_PROPOSER=xxx in the .env file
+    address constant internal DEPLOYER = vm.envAddress("DEPLOYER"); // TODO: define DEPLOYER=xxx in the .env file
+    address constant internal L2_OUTPUT_ORACLE_PROXY = vm.envAddress("L2_OUTPUT_ORACLE_PROXY"); // TODO: define L2_OUTPUT_ORACLE_PROXY=xxx in the .env file
+
+    function run() public {
+        L2OutputOracle existingL2OO = L2OutputOracle(L2_OUTPUT_ORACLE_PROXY);
+        uint256 oldSubmissionInterval = existingL2OO.SUBMISSION_INTERVAL();
+        uint256 oldL2BlockTime = existingL2OO.L2_BLOCK_TIME();
+        uint256 oldFinalizationPeriodSeconds = existingL2OO.FINALIZATION_PERIOD_SECONDS();
+        uint256 startingBlockNumber = existingL2OO.startingBlockNumber();
+        uint256 startingTimestamp = existingL2OO.startingTimestamp();
+        address oldProposer = existingL2OO.PROPOSER();
+        address oldChallenger = existingL2OO.CHALLENGER();
+
+        console.log(oldProposer);
+        console.log(NEW_PROPOSER);
+
+        // Deploy L2OutputOracle new implementation wiht the new submission interval
+        vm.broadcast(DEPLOYER);
+        L2OutputOracle l2OutputOracleImpl = new L2OutputOracle({
+            _submissionInterval: oldSubmissionInterval,
+            _l2BlockTime: oldL2BlockTime,
+            _startingBlockNumber: startingBlockNumber,
+            _startingTimestamp: startingTimestamp,
+            _proposer: NEW_PROPOSER,
+            _challenger: oldChallenger,
+            _finalizationPeriodSeconds: oldFinalizationPeriodSeconds            
+        });
+
+        require(l2OutputOracleImpl.L2_BLOCK_TIME() == oldL2BlockTime, "Deploy: l2OutputOracle l2BlockTime is incorrect");
+        require(l2OutputOracleImpl.PROPOSER() == NEW_PROPOSER, "Deploy: l2OutputOracle proposer is incorrect");
+
+        console.logAddress(address(l2OutputOracleImpl));
+    }
+}

goerli-devnet/2023-05-18-deploy/foundry.toml renamed to goerli-alpha/2023-05-18-deploy/foundry.toml

@@ -5,12 +5,8 @@ import "@base-contracts/script/universal/MultisigBuilder.sol";
 import "@eth-optimism-bedrock/contracts/L1/OptimismPortal.sol";
 
 contract UnpausePortal is MultisigBuilder {
-    // address constant internal OPTIMISM_PORTAL_PROXY = <TODO: insert OptimismPortalProxy address>;
-    //      mainnet value: 0x49048044D57e1C92A77f79988d21Fa8fAF74E97e
-    //      goerli value: 0xe93c8cD0D409341205A592f8c4Ac1A5fe5585cfA
-    // address constant internal GUARDIAN = <TODO: insert multisig which is Guardian address>;
-    //      mainnet value: 0x14536667Cd30e52C0b458BaACcB9faDA7046E056
-    //      goerli value: 0x4C35Ca57616E0d5fD808574772f632D8dA4eadCa
+    address constant internal OPTIMISM_PORTAL_PROXY = vm.envAddress("OPTIMISM_PORTAL_PROXY"); // TODO: define OPTIMISM_PORTAL_PROXY=xxx in the .env file
+    address constant internal GUARDIAN = vm.envAddress("GUARDIAN"); // TODO: define GUARDIAN=xxx in the .env file
 
     function _postCheck() internal override view {
         OptimismPortal optimismPortal = OptimismPortal(payable(OPTIMISM_PORTAL_PROXY));

goerli-devnet/2023-05-18-deploy/inputs/construct-config.sh renamed to goerli-alpha/2023-05-18-deploy/inputs/construct-config.sh

@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import "@eth-optimism-bedrock/src/universal/ProxyAdmin.sol";
+import "@base-contracts/script/universal/NestedMultisigBuilder.sol";
+
+contract UpdateProposer is NestedMultisigBuilder {
+    // TODO: this assumes a new L2OutputOracle implementation contract has already been deployed. See SetupNewProposer.s.sol.
+
+    address internal PROXY_ADMIN_CONTRACT = vm.envAddress("L1_PROXY_ADMIN"); // TODO: define L1_PROXY_ADMIN=xxx in the .env file
+    address internal PROXY_ADMIN_OWNER = vm.envAddress("L1_NESTED_SAFE"); // TODO: define L1_NESTED_SAFE=xxx in the .env file
+    address internal L2_OUTPUT_PROPOSER = vm.envAddress("L2_OUTPUT_PROPOSER"); // TODO: define L2_OUTPUT_PROPOSER=xxx in the .env file
+    address internal L2_OUTPUT_PROPOSER_NEW_IMPL = vm.envAddress("L2_OUTPUT_PROPOSER_NEW_IMPL"); // TODO: define L2_OUTPUT_PROPOSER_NEW_IMPL=xxx in the .env file
+
+    function _postCheck() internal override view {
+        ProxyAdmin proxyAdmin = ProxyAdmin(PROXY_ADMIN_CONTRACT);
+        require(proxyAdmin.getProxyImplementation(L2_OUTPUT_PROPOSER).codehash == L2_OUTPUT_PROPOSER_NEW_IMPL.codehash);
+    }
+
+    function _buildCalls() internal override view returns (IMulticall3.Call3[] memory) {
+        IMulticall3.Call3[] memory calls = new IMulticall3.Call3[](1);
+
+        calls[0] = IMulticall3.Call3({
+            target: PROXY_ADMIN_CONTRACT,
+            allowFailure: false,
+            callData: abi.encodeCall(
+                ProxyAdmin.upgrade,
+                (payable(L2_OUTPUT_PROPOSER), L2_OUTPUT_PROPOSER_NEW_IMPL)
+            )
+        });
+
+        return calls;
+    }
+
+    function _ownerSafe() internal override view returns (address) {
+        return PROXY_ADMIN_OWNER;
+    }
+}