maint: rename Safe folder to safe (#11882)

Renames the Safe folder (uppercase) to safe (lowercase) in line
with all other folders.

packages/contracts-bedrock/scripts/deploy/DeployOwnership.s.sol

@@ -11,9 +11,9 @@ import { GuardManager } from "safe-contracts/base/GuardManager.sol";
 
 import { Deployer } from "scripts/deploy/Deployer.sol";
 
-import { LivenessGuard } from "src/Safe/LivenessGuard.sol";
-import { LivenessModule } from "src/Safe/LivenessModule.sol";
-import { DeputyGuardianModule } from "src/Safe/DeputyGuardianModule.sol";
+import { LivenessGuard } from "src/safe/LivenessGuard.sol";
+import { LivenessModule } from "src/safe/LivenessModule.sol";
+import { DeputyGuardianModule } from "src/safe/DeputyGuardianModule.sol";
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 
 import { Deploy } from "./Deploy.s.sol";

packages/contracts-bedrock/scripts/testing/test-heavy-fuzz-modified-tests.sh

@@ -12,15 +12,10 @@ set -euo pipefail
 # modified.
 
 # Set the number of fuzz runs to run.
-# 75000 fuzz runs will guarantee that any test that fails 5% of the time with
-# the default 512 fuzz runs will fail >99.9% of the time (on average) inside of
-# this script.
-FUZZ_RUNS=${1:-75000}
+FUZZ_RUNS=${1:-10000}
 
 # Set the number of invariant runs to run.
-# Invariant runs are generally slower than fuzz runs so we can't afford to run
-# as many of them. 25000 is probably good enough for most cases.
-INVARIANT_RUNS=${2:-25000}
+INVARIANT_RUNS=${2:-10000}
 
 # Verify that FUZZ_RUNS is a number.
 if ! [[ "$FUZZ_RUNS" =~ ^[0-9]+$ ]]; then

packages/contracts-bedrock/semver-lock.json

@@ -139,18 +139,6 @@
     "initCodeHash": "0x789916977b4930eb266f2187a100bc432c12b76e3872931be673a7ef2773507a",
     "sourceCodeHash": "0x3f7bd622a788b8d00fe1631b14b761488eedccf56879f7ea2d610dd5ce81efbe"
   },
-  "src/Safe/DeputyGuardianModule.sol": {
-    "initCodeHash": "0x785cb529957f4d42d1659f2c37967dce7c621f3c6e06550600897205c2551a88",
-    "sourceCodeHash": "0xc8df2c0ae90cff18ddd4d2b8e2d44689e3c4c98e96c746c4ee9baaebf6a80ec4"
-  },
-  "src/Safe/LivenessGuard.sol": {
-    "initCodeHash": "0xfd74ff89e7b689b38ab97515d64429ffaf6c0cd1ea6488c6a4743a0665419c85",
-    "sourceCodeHash": "0xcfeadabe8da944fb64d85c9c971ee364baddcc6aa5b5a0701049669ce372cd90"
-  },
-  "src/Safe/LivenessModule.sol": {
-    "initCodeHash": "0xcfccdd9e423c95a0ddc6e09ccb6333d5fc8429ed2b8fc872f1290d392ae13aad",
-    "sourceCodeHash": "0x255a3f78036745feb57da2e16a93a83fe3f52944fec42029da9b9eaa147db11c"
-  },
   "src/cannon/MIPS.sol": {
     "initCodeHash": "0x6add59adb849ec02e13b33df7efd439ca80f6a8ceefdf69ebcb0963c0167da23",
     "sourceCodeHash": "0xee1aef5a502f9491b7b83dab46ea2f0fc286f87ace31edcc1367c840d462bdfe"
@@ -207,6 +195,18 @@
     "initCodeHash": "0x28dfa6676702a7abd19609cc773158d1f958210bc0a38c008d67a002dc1df862",
     "sourceCodeHash": "0x3a0a294932d6deba043f6a2b46b4e8477ee96e7fb054d7e7229a43ce4352c68d"
   },
+  "src/safe/DeputyGuardianModule.sol": {
+    "initCodeHash": "0x785cb529957f4d42d1659f2c37967dce7c621f3c6e06550600897205c2551a88",
+    "sourceCodeHash": "0xc8df2c0ae90cff18ddd4d2b8e2d44689e3c4c98e96c746c4ee9baaebf6a80ec4"
+  },
+  "src/safe/LivenessGuard.sol": {
+    "initCodeHash": "0xfd74ff89e7b689b38ab97515d64429ffaf6c0cd1ea6488c6a4743a0665419c85",
+    "sourceCodeHash": "0xa40ea6472d9c7e124791489c0899822d6f6b19b16e583d3b437674c615e4bac3"
+  },
+  "src/safe/LivenessModule.sol": {
+    "initCodeHash": "0xcfccdd9e423c95a0ddc6e09ccb6333d5fc8429ed2b8fc872f1290d392ae13aad",
+    "sourceCodeHash": "0xd1479c60087f352385b6d5379ef3cc07839f671d617626b4c94ece91da781ef2"
+  },
   "src/universal/OptimismMintableERC20.sol": {
     "initCodeHash": "0xfc77e4db406c232d8b84a3f77b939fb08fa27852faa5f4b0d78d998402caf308",
     "sourceCodeHash": "0xd7957c662ef03fc0cc3440a6ec6737a55f90b52a977262a260cd99fe96494267"

packages/contracts-bedrock/src/Safe/LivenessGuard.sol → packages/contracts-bedrock/src/safe/LivenessGuard.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.15;
 
 import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import { Guard as BaseGuard } from "safe-contracts/base/GuardManager.sol";
-import { SafeSigners } from "src/Safe/SafeSigners.sol";
+import { SafeSigners } from "src/safe/SafeSigners.sol";
 import { Enum } from "safe-contracts/common/Enum.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { EnumerableSet } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";

packages/contracts-bedrock/src/Safe/LivenessModule.sol → packages/contracts-bedrock/src/safe/LivenessModule.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.15;
 import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import { Enum } from "safe-contracts/common/Enum.sol";
 import { OwnerManager } from "safe-contracts/base/OwnerManager.sol";
-import { LivenessGuard } from "src/Safe/LivenessGuard.sol";
+import { LivenessGuard } from "src/safe/LivenessGuard.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 
 /// @title LivenessModule

packages/contracts-bedrock/test/Specs.t.sol

@@ -943,11 +943,11 @@ contract Specification_Test is CommonTest {
         string[] memory pathExcludes = new string[](5);
         pathExcludes[0] = "src/dispute/interfaces/*";
         pathExcludes[1] = "src/dispute/lib/*";
-        pathExcludes[2] = "src/Safe/SafeSigners.sol";
+        pathExcludes[2] = "src/safe/SafeSigners.sol";
         pathExcludes[3] = "src/L1/interfaces/*";
         pathExcludes[4] = "src/governance/interfaces/*";
         Abi[] memory abis = ForgeArtifacts.getContractFunctionAbis(
-            "src/{L1,dispute,governance,Safe,universal/ProxyAdmin.sol}", pathExcludes
+            "src/{L1,dispute,governance,safe,universal/ProxyAdmin.sol}", pathExcludes
         );
 
         uint256 numCheckedEntries = 0;

packages/contracts-bedrock/test/Safe/DeployOwnership.t.sol → packages/contracts-bedrock/test/safe/DeployOwnership.t.sol

@@ -15,9 +15,9 @@ import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import { ModuleManager } from "safe-contracts/base/ModuleManager.sol";
 import { GuardManager } from "safe-contracts/base/GuardManager.sol";
 
-import { LivenessGuard } from "src/Safe/LivenessGuard.sol";
-import { LivenessModule } from "src/Safe/LivenessModule.sol";
-import { DeputyGuardianModule } from "src/Safe/DeputyGuardianModule.sol";
+import { LivenessGuard } from "src/safe/LivenessGuard.sol";
+import { LivenessModule } from "src/safe/LivenessModule.sol";
+import { DeputyGuardianModule } from "src/safe/DeputyGuardianModule.sol";
 
 contract DeployOwnershipTest is Test, DeployOwnership {
     address internal constant SENTINEL_MODULES = address(0x1);

packages/contracts-bedrock/test/Safe/DeputyGuardianModule.t.sol → packages/contracts-bedrock/test/safe/DeputyGuardianModule.t.sol

@@ -9,7 +9,7 @@ import "test/safe-tools/SafeTestTools.sol";
 import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
 import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
 import { AnchorStateRegistry } from "src/dispute/AnchorStateRegistry.sol";
-import { DeputyGuardianModule } from "src/Safe/DeputyGuardianModule.sol";
+import { DeputyGuardianModule } from "src/safe/DeputyGuardianModule.sol";
 
 import "src/dispute/lib/Types.sol";
 

packages/contracts-bedrock/test/Safe/LivenessGuard.t.sol → packages/contracts-bedrock/test/safe/LivenessGuard.t.sol

@@ -10,7 +10,7 @@ import { Enum } from "safe-contracts/common/Enum.sol";
 import "test/safe-tools/SafeTestTools.sol";
 import { EnumerableSet } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
-import { LivenessGuard } from "src/Safe/LivenessGuard.sol";
+import { LivenessGuard } from "src/safe/LivenessGuard.sol";
 
 /// @dev A wrapper contract exposing the length of the ownersBefore set in the LivenessGuard.
 contract WrappedGuard is LivenessGuard {
@@ -235,7 +235,16 @@ contract LivenessGuard_FuzzOwnerManagement_Test is StdCheats, StdUtils, Liveness
     )
         external
     {
-        vm.assume(changes.length < 20);
+        // Cut down the changes array to a maximum of 20.
+        // We don't use vm.assume to avoid throwing out too many inputs.
+        OwnerChange[] memory boundedChanges = new OwnerChange[](bound(changes.length, 0, 20));
+        for (uint256 i; i < boundedChanges.length; i++) {
+            boundedChanges[i] = changes[i];
+        }
+
+        // Update the original array.
+        changes = boundedChanges;
+
         // Initialize the safe with more owners than changes, to ensure we don't try to remove them all
         initialOwners = bound(initialOwners, changes.length, 2 * changes.length);
 

packages/contracts-bedrock/test/Safe/LivenessModule.t.sol → packages/contracts-bedrock/test/safe/LivenessModule.t.sol

@@ -7,8 +7,8 @@ import { OwnerManager } from "safe-contracts/base/OwnerManager.sol";
 import { Enum } from "safe-contracts/common/Enum.sol";
 import "test/safe-tools/SafeTestTools.sol";
 
-import { LivenessModule } from "src/Safe/LivenessModule.sol";
-import { LivenessGuard } from "src/Safe/LivenessGuard.sol";
+import { LivenessModule } from "src/safe/LivenessModule.sol";
+import { LivenessGuard } from "src/safe/LivenessGuard.sol";
 
 contract LivenessModule_TestInit is Test, SafeTestTools {
     using SafeTestLib for SafeInstance;

packages/contracts-bedrock/test/Safe/SafeSigners.t.sol → packages/contracts-bedrock/test/safe/SafeSigners.t.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
 import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
-import { SafeSigners } from "src/Safe/SafeSigners.sol";
+import { SafeSigners } from "src/safe/SafeSigners.sol";
 import "test/safe-tools/SafeTestTools.sol";
 
 contract SafeSigners_Test is Test, SafeTestTools {