ctb: Change Safe contract version to GnosisSafe v1.3.0

packages/contracts-bedrock/scripts/Deploy.s.sol

@@ -7,8 +7,8 @@ import { Script } from "forge-std/Script.sol";
 import { console2 as console } from "forge-std/console2.sol";
 import { stdJson } from "forge-std/StdJson.sol";
 
-import { Safe } from "safe-contracts/Safe.sol";
-import { SafeProxyFactory } from "safe-contracts/proxies/SafeProxyFactory.sol";
+import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
+import { GnosisSafeProxyFactory as SafeProxyFactory } from "safe-contracts/proxies/GnosisSafeProxyFactory.sol";
 import { Enum as SafeOps } from "safe-contracts/common/Enum.sol";
 
 import { Deployer } from "scripts/Deployer.sol";

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

@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import { console2 as console } from "forge-std/console2.sol";
 import { stdJson } from "forge-std/StdJson.sol";
 
-import { Safe } from "safe-contracts/Safe.sol";
+import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import { OwnerManager } from "safe-contracts/base/OwnerManager.sol";
 import { ModuleManager } from "safe-contracts/base/ModuleManager.sol";
 import { GuardManager } from "safe-contracts/base/GuardManager.sol";

packages/contracts-bedrock/semver-lock.json

@@ -105,15 +105,15 @@
   },
   "src/Safe/DeputyGuardianModule.sol": {
     "initCodeHash": "0x433eb7488e613a51c7ff05a76bbecf47f5beac8b8614f5c50001f99e39ae7ed2",
-    "sourceCodeHash": "0x2919835fc15c166a027b2ff1cf801c847f139948baf2df0db3d02ac3017c09d9"
+    "sourceCodeHash": "0x5b415dc432a83fb1d5c41585539245997c62acb6bd77c489bf57e9b59be5f983"
   },
   "src/Safe/LivenessGuard.sol": {
-    "initCodeHash": "0x16ec47f0888391638814047a1735dbac849b48e256b2e20182bbb3186d950a3c",
-    "sourceCodeHash": "0x9633cea9b66077e222f470439fe3e9a31f3e33b4f7a5618374c44310fd234b24"
+    "initCodeHash": "0xf54289de5cef7ba0044e0d63310937fa231d6528aac91e13e531c845af42afac",
+    "sourceCodeHash": "0xea3872d8f196ae3c863363dfa4b57803cb2a24b0c100244d8f861891e901e03f"
   },
   "src/Safe/LivenessModule.sol": {
     "initCodeHash": "0xa8b233f0f26f8a73b997b12ba06d64cefa8ee98d523f68cd63320e9787468fae",
-    "sourceCodeHash": "0x73aa5934e56ba2a45f368806c5db1d442bf5713d51b2184749f4638eaceb832e"
+    "sourceCodeHash": "0x15dfd32e92577f4cb5ab05def834a5a1b183e30ca249184f282fca6441be8788"
   },
   "src/cannon/MIPS.sol": {
     "initCodeHash": "0xd447743c7a3c1babe141050603dd643467ada00bd90465a52ef3093445ee1b02",

packages/contracts-bedrock/snapshots/abi/DeputyGuardianModule.json

@@ -2,7 +2,7 @@
   {
     "inputs": [
       {
-        "internalType": "contract Safe",
+        "internalType": "contract GnosisSafe",
         "name": "_safe",
         "type": "address"
       },
@@ -63,7 +63,7 @@
     "name": "safe",
     "outputs": [
       {
-        "internalType": "contract Safe",
+        "internalType": "contract GnosisSafe",
         "name": "safe_",
         "type": "address"
       }

packages/contracts-bedrock/snapshots/abi/LivenessGuard.json

@@ -2,7 +2,7 @@
   {
     "inputs": [
       {
-        "internalType": "contract Safe",
+        "internalType": "contract GnosisSafe",
         "name": "_safe",
         "type": "address"
       }
@@ -115,7 +115,7 @@
     "name": "safe",
     "outputs": [
       {
-        "internalType": "contract Safe",
+        "internalType": "contract GnosisSafe",
         "name": "safe_",
         "type": "address"
       }
@@ -130,25 +130,6 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes4",
-        "name": "interfaceId",
-        "type": "bytes4"
-      }
-    ],
-    "name": "supportsInterface",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "version",

packages/contracts-bedrock/snapshots/abi/LivenessModule.json

@@ -2,7 +2,7 @@
   {
     "inputs": [
       {
-        "internalType": "contract Safe",
+        "internalType": "contract GnosisSafe",
         "name": "_safe",
         "type": "address"
       },
@@ -148,7 +148,7 @@
     "name": "safe",
     "outputs": [
       {
-        "internalType": "contract Safe",
+        "internalType": "contract GnosisSafe",
         "name": "safe_",
         "type": "address"
       }

packages/contracts-bedrock/src/Safe/DeputyGuardianModule.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { Safe } from "safe-contracts/Safe.sol";
+import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import { Enum } from "safe-contracts/common/Enum.sol";
 
 import { SuperchainConfig } from "src/L1/SuperchainConfig.sol";

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

@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { Safe } from "safe-contracts/Safe.sol";
-import { BaseGuard, GuardManager } from "safe-contracts/base/GuardManager.sol";
-import { ModuleManager } from "safe-contracts/base/ModuleManager.sol";
+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 { Enum } from "safe-contracts/common/Enum.sol";
 import { ISemver } from "src/universal/ISemver.sol";

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

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { Safe, OwnerManager } from "safe-contracts/Safe.sol";
+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";

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

@@ -10,7 +10,7 @@ import {
 } from "scripts/DeployOwnership.s.sol";
 import { Test } from "forge-std/Test.sol";
 
-import { Safe } from "safe-contracts/Safe.sol";
+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";
 

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

@@ -3,7 +3,7 @@ pragma solidity 0.8.15;
 
 import { CommonTest } from "test/setup/CommonTest.sol";
 import { ForgeArtifacts, Abi } from "scripts/ForgeArtifacts.sol";
-import { Safe } from "safe-contracts/Safe.sol";
+import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import "test/safe-tools/SafeTestTools.sol";
 
 import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";

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

@@ -4,9 +4,8 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 import { StdUtils } from "forge-std/StdUtils.sol";
 import { StdCheats } from "forge-std/StdCheats.sol";
-import { Safe, OwnerManager } from "safe-contracts/Safe.sol";
-import { SafeProxyFactory } from "safe-contracts/proxies/SafeProxyFactory.sol";
-import { ModuleManager } from "safe-contracts/base/ModuleManager.sol";
+import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
+import { OwnerManager } from "safe-contracts/base/OwnerManager.sol";
 import { Enum } from "safe-contracts/common/Enum.sol";
 import "test/safe-tools/SafeTestTools.sol";
 import { EnumerableSet } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";

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

@@ -1,10 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { Test, StdUtils } from "forge-std/Test.sol";
-import { Safe } from "safe-contracts/Safe.sol";
-import { SafeProxyFactory } from "safe-contracts/proxies/SafeProxyFactory.sol";
-import { ModuleManager } from "safe-contracts/base/ModuleManager.sol";
+import { Test } from "forge-std/Test.sol";
+import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import { OwnerManager } from "safe-contracts/base/OwnerManager.sol";
 import { Enum } from "safe-contracts/common/Enum.sol";
 import "test/safe-tools/SafeTestTools.sol";

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

@@ -2,12 +2,10 @@
 pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
-import { Safe } from "safe-contracts/Safe.sol";
+import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import { SafeSigners } from "src/Safe/SafeSigners.sol";
 import "test/safe-tools/SafeTestTools.sol";
 
-import { SignatureDecoder } from "safe-contracts/common/SignatureDecoder.sol";
-
 contract SafeSigners_Test is Test, SafeTestTools {
     bytes4 internal constant EIP1271_MAGIC_VALUE = 0x20c13b0b;
 

packages/contracts-bedrock/test/safe-tools/CompatibilityFallbackHandler_1_3_0.sol

@@ -6,7 +6,7 @@ import "safe-contracts/interfaces/ERC721TokenReceiver.sol";
 import "safe-contracts/interfaces/ERC777TokensRecipient.sol";
 import "safe-contracts/interfaces/IERC165.sol";
 import "safe-contracts/interfaces/ISignatureValidator.sol";
-import { Safe as GnosisSafe } from "safe-contracts/Safe.sol";
+import { GnosisSafe } from "safe-contracts/GnosisSafe.sol";
 
 /// author: Colin Nielsen
 /// https://github.com/colinnielsen/safe-tools/blob/ce6c654a76d91b619ab7778c77d1a76b3ced6666/src/CompatibilityFallbackHandler_1_3_0.sol

packages/contracts-bedrock/test/safe-tools/SafeTestTools.sol

@@ -3,10 +3,13 @@ pragma solidity >=0.7.0 <0.9.0;
 
 import "forge-std/Test.sol";
 import { LibSort } from "@solady/utils/LibSort.sol";
-import { Safe as GnosisSafe, OwnerManager, ModuleManager, GuardManager } from "safe-contracts/Safe.sol";
-import { SafeProxyFactory as GnosisSafeProxyFactory } from "safe-contracts/proxies/SafeProxyFactory.sol";
+import { GnosisSafe } from "safe-contracts/GnosisSafe.sol";
+import { OwnerManager } from "safe-contracts/base/OwnerManager.sol";
+import { ModuleManager } from "safe-contracts/base/ModuleManager.sol";
+import { GuardManager } from "safe-contracts/base/GuardManager.sol";
+import { GnosisSafeProxyFactory } from "safe-contracts/proxies/GnosisSafeProxyFactory.sol";
 import { Enum } from "safe-contracts/common/Enum.sol";
-import { SignMessageLib } from "safe-contracts/libraries/SignMessageLib.sol";
+import { SignMessageLib } from "safe-contracts/examples/libraries/SignMessage.sol";
 import "./CompatibilityFallbackHandler_1_3_0.sol";
 
 // Tools to simplify testing Safe contracts