Reintroduce nested multisig contracts for backwards compatibility

script/deploy/l1/SetGasLimit.sol

@@ -2,10 +2,10 @@
 pragma solidity 0.8.15;
 
 import {SystemConfig} from "@eth-optimism-bedrock/src/L1/SystemConfig.sol";
-import {MultisigBuilder, IMulticall3, IGnosisSafe, Simulation} from "../../universal/MultisigBuilder.sol";
+import {MultisigScript, IMulticall3, IGnosisSafe, Simulation} from "../../universal/MultisigScript.sol";
 import {Vm} from "forge-std/Vm.sol";
 
-contract SetGasLimit is MultisigBuilder {
+contract SetGasLimit is MultisigScript {
     address internal SYSTEM_CONFIG_OWNER = vm.envAddress("SYSTEM_CONFIG_OWNER");
     address internal L1_SYSTEM_CONFIG = vm.envAddress("L1_SYSTEM_CONFIG_ADDRESS");
 

script/universal/DoubleNestedMultisigBuilder.sol

@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.15;
+
+import {MultisigScript} from "./MultisigScript.sol";
+
+/**
+ * @title DoubleNestedMultisigBuilder
+ * @custom:deprecated Use `MultisigScript` instead.
+ */
+abstract contract DoubleNestedMultisigBuilder is MultisigScript {
+    /*
+     * @custom:deprecated Use `sign(address[] memory _safes)` instead.
+     */
+    function sign(address _signerSafe, address _intermediateSafe) public {
+        sign(_toArray(_signerSafe, _intermediateSafe));
+    }
+
+    /*
+     * @custom:deprecated Use `verify(address[] memory _safes, bytes memory _signatures)` instead.
+     */
+    function verify(address _signerSafe, address _intermediateSafe, bytes memory _signatures) public view {
+        verify(_toArray(_signerSafe, _intermediateSafe), _signatures);
+    }
+
+    /*
+     * @custom:deprecated Use `approve(address[] memory _safes, bytes memory _signatures)` instead.
+     */
+    function approveOnBehalfOfSignerSafe(address _signerSafe, address _intermediateSafe, bytes memory _signatures)
+        public
+    {
+        approve(_toArray(_signerSafe, _intermediateSafe), _signatures);
+    }
+
+    /*
+     * @custom:deprecated Use `approve(address[] memory _safes, bytes memory _signatures)` instead.
+     */
+    function approveOnBehalfOfIntermediateSafe(address _intermediateSafe) public {
+        approve(_toArray(_intermediateSafe), "");
+    }
+
+    /*
+     * @custom:deprecated Use `simulate(bytes memory _signatures)` instead, with empty `_signatures`.
+     */
+    function simulate() public {
+        simulate("");
+    }
+
+    /*
+     * @custom:deprecated Use `run(bytes memory _signatures)` instead, with empty `_signatures`.
+     */
+    function run() public {
+        run("");
+    }
+}

script/universal/NestedMultisigBuilder.sol

@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.15;
+
+import {MultisigScript} from "./MultisigScript.sol";
+
+/**
+ * @title NestedMultisigBuilder
+ * @custom:deprecated Use `MultisigScript` instead.
+ */
+abstract contract NestedMultisigBuilder is MultisigScript {
+    /*
+     * @custom:deprecated Use `sign(address[] memory _safes)` instead.
+     */
+    function sign(address _signerSafe) public {
+        sign(_toArray(_signerSafe));
+    }
+
+    /*
+     * @custom:deprecated Use `verify(address[] memory _safes, bytes memory _signatures)` instead.
+     */
+    function verify(address _signerSafe, bytes memory _signatures) public view {
+        verify(_toArray(_signerSafe), _signatures);
+    }
+
+    /*
+     * @custom:deprecated Use `approve(address[] memory _safes, bytes memory _signatures)` instead.
+     */
+    function approve(address _signerSafe, bytes memory _signatures) public {
+        approve(_toArray(_signerSafe), _signatures);
+    }
+
+    /*
+     * @custom:deprecated Use `simulate(bytes memory _signatures)` instead, with empty `_signatures`.
+     */
+    function simulate() public {
+        simulate("");
+    }
+
+    /*
+     * @custom:deprecated Use `run(bytes memory _signatures)` instead, with empty `_signatures`.
+     */
+    function run() public {
+        run("");
+    }
+}

test/universal/DoubleNestedMultisigBuilder.t.sol

@@ -7,12 +7,12 @@ import {Vm} from "forge-std/Vm.sol";
 
 import {Preinstalls} from "@eth-optimism-bedrock/src/libraries/Preinstalls.sol";
 
-import {MultisigBuilder} from "../../script/universal/MultisigBuilder.sol";
+import {DoubleNestedMultisigBuilder} from "../../script/universal/DoubleNestedMultisigBuilder.sol";
 import {Simulation} from "../../script/universal/Simulation.sol";
 import {IGnosisSafe} from "../../script/universal/IGnosisSafe.sol";
 import {Counter} from "./Counter.sol";
 
-contract DoubleNestedMultisigBuilderTest is Test, MultisigBuilder {
+contract DoubleNestedMultisigBuilderTest is Test, DoubleNestedMultisigBuilder {
     Vm.Wallet internal wallet1 = vm.createWallet("1");
     Vm.Wallet internal wallet2 = vm.createWallet("2");
 

test/universal/NestedMultisigBuilder.t.sol

@@ -7,12 +7,12 @@ import {Vm} from "forge-std/Vm.sol";
 
 import {Preinstalls} from "@eth-optimism-bedrock/src/libraries/Preinstalls.sol";
 
-import {MultisigBuilder} from "../../script/universal/MultisigBuilder.sol";
+import {NestedMultisigBuilder} from "../../script/universal/NestedMultisigBuilder.sol";
 import {Simulation} from "../../script/universal/Simulation.sol";
 import {IGnosisSafe} from "../../script/universal/IGnosisSafe.sol";
 import {Counter} from "./Counter.sol";
 
-contract NestedMultisigBuilderTest is Test, MultisigBuilder {
+contract NestedMultisigBuilderTest is Test, NestedMultisigBuilder {
     Vm.Wallet internal wallet1 = vm.createWallet("1");
     Vm.Wallet internal wallet2 = vm.createWallet("2");