multisig

Author: ratankaliani

contracts/test/helpers/Utils.sol

@@ -9,61 +9,84 @@ import {OPSuccinctL2OutputOracle} from "src/OPSuccinctL2OutputOracle.sol";
 
 contract Utils is Test, JSONDecoder {
     function deployWithConfig(Config memory cfg) public returns (address) {
-        address OPSuccinctL2OutputOracleImpl = address(new OPSuccinctL2OutputOracle());
+        address OPSuccinctL2OutputOracleImpl = address(
+            new OPSuccinctL2OutputOracle()
+        );
         address l2OutputOracleProxy = address(new Proxy(address(this)));
 
         // Upgrade the proxy to point to the implementation and call initialize().
         // Override the starting output root and timestmp with the passed values.
-        upgradeAndInitialize(OPSuccinctL2OutputOracleImpl, cfg, l2OutputOracleProxy, address(0));
+        upgradeAndInitialize(
+            OPSuccinctL2OutputOracleImpl,
+            cfg,
+            l2OutputOracleProxy,
+            address(0)
+        );
 
         // Transfer ownership of proxy to owner specified in the config.
         Proxy(payable(l2OutputOracleProxy)).changeAdmin(cfg.owner);
 
         return l2OutputOracleProxy;
     }
 
-    function upgradeAndInitialize(address impl, Config memory cfg, address l2OutputOracleProxy, address _spoofedAdmin)
-        public
-    {
+    function upgradeAndInitialize(
+        address impl,
+        Config memory cfg,
+        address l2OutputOracleProxy,
+        address _spoofedAdmin
+    ) public {
         // require that the verifier gateway is deployed
         require(
             address(cfg.verifierGateway).code.length > 0,
             "OPSuccinctL2OutputOracleUpgrader: verifier gateway not deployed"
         );
 
-        OPSuccinctL2OutputOracle.InitParams memory initParams = OPSuccinctL2OutputOracle.InitParams({
-            chainId: cfg.chainId,
-            verifierGateway: cfg.verifierGateway,
-            aggregationVkey: cfg.aggregationVkey,
-            rangeVkeyCommitment: cfg.rangeVkeyCommitment,
-            owner: cfg.owner,
-            startingOutputRoot: cfg.startingOutputRoot,
-            rollupConfigHash: cfg.rollupConfigHash
-        });
+        OPSuccinctL2OutputOracle.InitParams
+            memory initParams = OPSuccinctL2OutputOracle.InitParams({
+                chainId: cfg.chainId,
+                verifierGateway: cfg.verifierGateway,
+                aggregationVkey: cfg.aggregationVkey,
+                rangeVkeyCommitment: cfg.rangeVkeyCommitment,
+                owner: cfg.owner,
+                startingOutputRoot: cfg.startingOutputRoot,
+                rollupConfigHash: cfg.rollupConfigHash
+            });
 
         // If we are spoofing the admin (used in testing), start prank.
         if (_spoofedAdmin != address(0)) vm.startPrank(_spoofedAdmin);
 
+        bytes memory upgradeCalldata = abi.encodeCall(
+            OPSuccinctL2OutputOracle.initialize,
+            (
+                cfg.submissionInterval,
+                cfg.l2BlockTime,
+                cfg.startingBlockNumber,
+                cfg.startingTimestamp,
+                cfg.proposer,
+                cfg.challenger,
+                cfg.finalizationPeriod,
+                initParams
+            )
+        );
+
+        // Raw calldata for a call by a multisig.
+        bytes memory multisigCalldata = abi.encodeWithSelector(
+            Proxy.upgradeToAndCall.selector,
+            impl,
+            upgradeCalldata
+        );
+        console.logBytes(multisigCalldata);
+
         Proxy(payable(l2OutputOracleProxy)).upgradeToAndCall(
             impl,
-            abi.encodeCall(
-                OPSuccinctL2OutputOracle.initialize,
-                (
-                    cfg.submissionInterval,
-                    cfg.l2BlockTime,
-                    cfg.startingBlockNumber,
-                    cfg.startingTimestamp,
-                    cfg.proposer,
-                    cfg.challenger,
-                    cfg.finalizationPeriod,
-                    initParams
-                )
-            )
+            upgradeCalldata
         );
     }
 
     // Read the config from the json file.
-    function readJson(string memory filepath) public view returns (Config memory) {
+    function readJson(
+        string memory filepath
+    ) public view returns (Config memory) {
         string memory root = vm.projectRoot();
         string memory path = string.concat(root, "/", filepath);
         string memory json = vm.readFile(path);