chore: fix imports and silence linter warnings for script files (#118)

* fix imports and silence linter warnings for script files * reduce solhint-disable statements * remove unnecessary lines from test files
base-org · Jan 22, 2025 · 07afeac · 07afeac
1 parent 1f3ffe8
commit 07afeac
Show file tree

Hide file tree

Showing 18 changed files with 73 additions and 28 deletions.
diff --git a/script/deploy/Utils.sol b/script/deploy/Utils.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import "forge-std/Script.sol";
-import "forge-std/StdJson.sol";
+import {Script} from "forge-std/Script.sol";
+import {stdJson} from "forge-std/StdJson.sol";
 
 contract Utils is Script {
     using stdJson for string;

diff --git a/script/deploy/l1/RollbackGasLimit.sol b/script/deploy/l1/RollbackGasLimit.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import "./SetGasLimitBuilder.sol";
+import {SetGasLimitBuilder} from "./SetGasLimitBuilder.sol";
 
 contract RollbackGasLimit is SetGasLimitBuilder {
     function _fromGasLimit() internal view override returns (uint64) {

diff --git a/script/deploy/l1/SetGasLimitBuilder.sol b/script/deploy/l1/SetGasLimitBuilder.sol
@@ -58,6 +58,7 @@ abstract contract SetGasLimitBuilder is MultisigBuilder {
             key: 0x0000000000000000000000000000000000000000000000000000000000000068, // slot of gas limit
             value: bytes32(uint256(_fromGasLimit()))
         });
+        // solhint-disable-next-line max-line-length
         _stateOverrides[0] = Simulation.StateOverride({contractAddress: L1_SYSTEM_CONFIG, overrides: _storageOverrides});
         return _stateOverrides;
     }

diff --git a/script/deploy/l1/UpgradeGasLimit.sol b/script/deploy/l1/UpgradeGasLimit.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import "./SetGasLimitBuilder.sol";
+import {SetGasLimitBuilder} from "./SetGasLimitBuilder.sol";
 
 contract UpgradeGasLimit is SetGasLimitBuilder {
     function _fromGasLimit() internal view override returns (uint64) {

diff --git a/script/deploy/l1/tests/DeployTestTokenContracts.s.sol b/script/deploy/l1/tests/DeployTestTokenContracts.s.sol
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import "forge-std/console.sol";
-import "forge-std/Script.sol";
+// solhint-disable no-console
+import {console} from "forge-std/console.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {ERC20PresetMinterPauser} from "@openzeppelin/contracts/token/ERC20/presets/ERC20PresetMinterPauser.sol";
 import {ERC721PresetMinterPauserAutoId} from

diff --git a/script/deploy/l1/tests/TestDeposits.s.sol b/script/deploy/l1/tests/TestDeposits.s.sol
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import "forge-std/console.sol";
-import "forge-std/Script.sol";
+// solhint-disable no-console
+import {console} from "forge-std/console.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {ERC20PresetMinterPauser} from "@openzeppelin/contracts/token/ERC20/presets/ERC20PresetMinterPauser.sol";
 import {ERC721PresetMinterPauserAutoId} from

diff --git a/script/deploy/l2/tests/DeployTestTokenContracts.s.sol b/script/deploy/l2/tests/DeployTestTokenContracts.s.sol
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import "forge-std/console.sol";
-import "forge-std/Script.sol";
+// solhint-disable no-console
+import {console} from "forge-std/console.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {Predeploys} from "@eth-optimism-bedrock/src/libraries/Predeploys.sol";
 import {OptimismMintableERC20Factory} from "@eth-optimism-bedrock/src/universal/OptimismMintableERC20Factory.sol";

diff --git a/script/deploy/l2/tests/TestWithdraw.s.sol b/script/deploy/l2/tests/TestWithdraw.s.sol
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import "forge-std/console.sol";
-import "forge-std/Script.sol";
+// solhint-disable no-console
+import {console} from "forge-std/console.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {Predeploys} from "@eth-optimism-bedrock/src/libraries/Predeploys.sol";
 import {L2StandardBridge} from "@eth-optimism-bedrock/src/L2/L2StandardBridge.sol";

diff --git a/script/universal/DoubleNestedMultisigBuilder.sol b/script/universal/DoubleNestedMultisigBuilder.sol
@@ -1,7 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
-import "./NestedMultisigBase.sol";
+import {IMulticall3} from "forge-std/interfaces/IMulticall3.sol";
+import {Vm} from "forge-std/Vm.sol";
+
+import {IGnosisSafe} from "./IGnosisSafe.sol";
+import {NestedMultisigBase} from "./NestedMultisigBase.sol";
+import {Simulation} from "./Simulation.sol";
 
 /**
  * @title DoubleNestedMultisigBuilder

diff --git a/script/universal/MultisigBase.sol b/script/universal/MultisigBase.sol
@@ -1,13 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
-import {Vm} from "forge-std/Vm.sol";
-import {console} from "forge-std/console.sol";
 import {CommonBase} from "forge-std/Base.sol";
+// solhint-disable no-console
+import {console} from "forge-std/console.sol";
 import {IMulticall3} from "forge-std/interfaces/IMulticall3.sol";
+import {Vm} from "forge-std/Vm.sol";
+
 import {IGnosisSafe, Enum} from "./IGnosisSafe.sol";
-import {Simulation} from "./Simulation.sol";
 import {Signatures} from "./Signatures.sol";
+import {Simulation} from "./Simulation.sol";
 
 abstract contract MultisigBase is CommonBase {
     bytes32 internal constant SAFE_NONCE_SLOT = bytes32(uint256(5));
@@ -73,6 +75,7 @@ abstract contract MultisigBase is CommonBase {
 
         console.log("########## IMPORTANT ##########");
         console.log(
+            // solhint-disable-next-line max-line-length
             "Please make sure that the 'Data to sign' displayed above matches what you see in the simulation and on your hardware wallet."
         );
         console.log("This is a critical step that must not be skipped.");

diff --git a/script/universal/MultisigBuilder.sol b/script/universal/MultisigBuilder.sol
@@ -1,12 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
-import "./MultisigBase.sol";
-
+// solhint-disable no-console
 import {console} from "forge-std/console.sol";
 import {IMulticall3} from "forge-std/interfaces/IMulticall3.sol";
 import {Vm} from "forge-std/Vm.sol";
 
+import {IGnosisSafe} from "./IGnosisSafe.sol";
+import {MultisigBase} from "./MultisigBase.sol";
+import {Signatures} from "./Signatures.sol";
+import {Simulation} from "./Simulation.sol";
+
 /**
  * @title MultisigBuilder
  * @notice Modeled from Optimism's SafeBuilder, but using signatures instead of approvals.

diff --git a/script/universal/NestedMultisigBase.sol b/script/universal/NestedMultisigBase.sol
@@ -1,7 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
-import "./MultisigBase.sol";
+// solhint-disable no-console
+import {console} from "forge-std/console.sol";
+import {IMulticall3} from "forge-std/interfaces/IMulticall3.sol";
+import {Vm} from "forge-std/Vm.sol";
+
+import {IGnosisSafe} from "./IGnosisSafe.sol";
+import {MultisigBase} from "./MultisigBase.sol";
+import {Signatures} from "./Signatures.sol";
+import {Simulation} from "./Simulation.sol";
 
 abstract contract NestedMultisigBase is MultisigBase {
     /**
@@ -69,6 +77,7 @@ abstract contract NestedMultisigBase is MultisigBase {
 
         bytes memory txData = abi.encodeCall(IMulticall3.aggregate3, (calls));
         console.log("---\nSimulation link:");
+        // solhint-disable max-line-length
         Simulation.logSimulationLink({_to: MULTICALL3_ADDRESS, _data: txData, _from: msg.sender, _overrides: overrides});
 
         // Forge simulation of the data logged in the link. If the simulation fails

diff --git a/script/universal/NestedMultisigBuilder.sol b/script/universal/NestedMultisigBuilder.sol
@@ -1,10 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
-import "./MultisigBase.sol";
-
+// solhint-disable no-console
 import {console} from "forge-std/console.sol";
 import {IMulticall3} from "forge-std/interfaces/IMulticall3.sol";
+import {Vm} from "forge-std/Vm.sol";
+
+import {IGnosisSafe} from "./IGnosisSafe.sol";
+import {MultisigBase} from "./MultisigBase.sol";
+import {Signatures} from "./Signatures.sol";
+import {Simulation} from "./Simulation.sol";
 
 /**
  * @title NestedMultisigBuilder
@@ -167,6 +172,7 @@ abstract contract NestedMultisigBuilder is MultisigBase {
 
         bytes memory txData = abi.encodeCall(IMulticall3.aggregate3, (calls));
         console.log("---\nSimulation link:");
+        // solhint-disable max-line-length
         Simulation.logSimulationLink({_to: MULTICALL3_ADDRESS, _data: txData, _from: msg.sender, _overrides: overrides});
 
         // Forge simulation of the data logged in the link. If the simulation fails

diff --git a/script/universal/Signatures.sol b/script/universal/Signatures.sol
@@ -1,10 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
+// solhint-disable no-console
+import {console} from "forge-std/console.sol";
+
 import {Bytes} from "@eth-optimism-bedrock/src/libraries/Bytes.sol";
 import {LibSort} from "@solady/utils/LibSort.sol";
+
 import {IGnosisSafe} from "./IGnosisSafe.sol";
-import {console} from "forge-std/console.sol";
 
 library Signatures {
     function prepareSignatures(address _safe, bytes32 hash, bytes memory _signatures)
@@ -64,6 +67,7 @@ library Signatures {
         return subset;
     }
 
+    // solhint-disable max-line-length
     /**
      * @notice Sorts the signatures in ascending order of the signer's address, and removes any duplicates.
      * @dev see https://github.com/safe-global/safe-smart-account/blob/1ed486bb148fe40c26be58d1b517cec163980027/contracts/Safe.sol#L265-L334

diff --git a/script/universal/Simulation.sol b/script/universal/Simulation.sol
@@ -1,8 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
+// solhint-disable no-console
 import {console} from "forge-std/console.sol";
 import {Vm} from "forge-std/Vm.sol";
+
 import {IGnosisSafe} from "./IGnosisSafe.sol";
 
 library Simulation {
@@ -27,6 +29,7 @@ library Simulation {
     }
 
     function simulateFromSimPayload(Payload memory simPayload) internal returns (Vm.AccountAccess[] memory) {
+        // solhint-disable-next-line max-line-length
         require(simPayload.from != address(0), "Simulator::simulateFromSimPayload: from address cannot be zero address");
         require(simPayload.to != address(0), "Simulator::simulateFromSimPayload: to address cannot be zero address");
 

diff --git a/test/universal/DoubleNestedMultisigBuilder.t.sol b/test/universal/DoubleNestedMultisigBuilder.t.sol
@@ -1,11 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+import {IMulticall3} from "forge-std/interfaces/IMulticall3.sol";
 import {Test} from "forge-std/Test.sol";
 import {Vm} from "forge-std/Vm.sol";
-import {console} from "forge-std/console.sol";
-import {IMulticall3} from "forge-std/interfaces/IMulticall3.sol";
+
 import {Preinstalls} from "@eth-optimism-bedrock/src/libraries/Preinstalls.sol";
+
 import {DoubleNestedMultisigBuilder} from "../../script/universal/DoubleNestedMultisigBuilder.sol";
 import {Simulation} from "../../script/universal/Simulation.sol";
 import {IGnosisSafe} from "../../script/universal/IGnosisSafe.sol";
@@ -22,6 +23,7 @@ contract DoubleNestedMultisigBuilderTest is Test, DoubleNestedMultisigBuilder {
     Counter internal counter = new Counter(address(safe4));
 
     bytes internal dataToSign1 =
+    // solhint-disable max-line-length
         hex"1901d4bb33110137810c444c1d9617abe97df097d587ecde64e6fcb38d7f49e1280c32a807b9689901dd0dbb7352e9e6c5265e3f6a68667de4be988f03f6a88511f7";
     bytes internal dataToSign2 =
         hex"190132640243d7aade8c72f3d90d2dbf359e9897feba5fce1453bc8d9e7ba10d171532a807b9689901dd0dbb7352e9e6c5265e3f6a68667de4be988f03f6a88511f7";

diff --git a/test/universal/MultisigBuilder.t.sol b/test/universal/MultisigBuilder.t.sol
@@ -1,11 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+import {IMulticall3} from "forge-std/interfaces/IMulticall3.sol";
 import {Test} from "forge-std/Test.sol";
 import {Vm} from "forge-std/Vm.sol";
-import {console} from "forge-std/console.sol";
-import {IMulticall3} from "forge-std/interfaces/IMulticall3.sol";
+
 import {Preinstalls} from "@eth-optimism-bedrock/src/libraries/Preinstalls.sol";
+
 import {MultisigBuilder} from "../../script/universal/MultisigBuilder.sol";
 import {Simulation} from "../../script/universal/Simulation.sol";
 import {IGnosisSafe} from "../../script/universal/IGnosisSafe.sol";
@@ -19,6 +20,7 @@ contract MultisigBuilderTest is Test, MultisigBuilder {
     Counter internal counter = new Counter(address(safe));
 
     bytes internal dataToSign =
+    // solhint-disable-next-line max-line-length
         hex"1901d4bb33110137810c444c1d9617abe97df097d587ecde64e6fcb38d7f49e1280c41dcff2c17a271265df60d1612a7387110475b6fc5178add5518196db5dba6bd";
 
     function setUp() public {

diff --git a/test/universal/NestedMultisigBuilder.t.sol b/test/universal/NestedMultisigBuilder.t.sol
@@ -1,11 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+import {IMulticall3} from "forge-std/interfaces/IMulticall3.sol";
 import {Test} from "forge-std/Test.sol";
 import {Vm} from "forge-std/Vm.sol";
-import {console} from "forge-std/console.sol";
-import {IMulticall3} from "forge-std/interfaces/IMulticall3.sol";
+
 import {Preinstalls} from "@eth-optimism-bedrock/src/libraries/Preinstalls.sol";
+
 import {NestedMultisigBuilder} from "../../script/universal/NestedMultisigBuilder.sol";
 import {Simulation} from "../../script/universal/Simulation.sol";
 import {IGnosisSafe} from "../../script/universal/IGnosisSafe.sol";
@@ -21,6 +22,7 @@ contract NestedMultisigBuilderTest is Test, NestedMultisigBuilder {
     Counter internal counter = new Counter(address(safe3));
 
     bytes internal dataToSign1 =
+    // solhint-disable max-line-length
         hex"1901d4bb33110137810c444c1d9617abe97df097d587ecde64e6fcb38d7f49e1280c3afd48ea8b0056e1028951ba44695d612396f4a1c3851f4b8a262c53ee1f2503";
     bytes internal dataToSign2 =
         hex"190132640243d7aade8c72f3d90d2dbf359e9897feba5fce1453bc8d9e7ba10d17153afd48ea8b0056e1028951ba44695d612396f4a1c3851f4b8a262c53ee1f2503";