Adding ISafe interface for CompatibilityFallbackHandler

contracts/Safe.sol

@@ -10,7 +10,7 @@ import {Singleton} from "./common/Singleton.sol";
 import {SignatureDecoder} from "./common/SignatureDecoder.sol";
 import {SecuredTokenTransfer} from "./common/SecuredTokenTransfer.sol";
 import {StorageAccessible} from "./common/StorageAccessible.sol";
-import {Enum} from "./common/Enum.sol";
+import {Enum} from "./interfaces/IEnum.sol";
 import {ISignatureValidator, ISignatureValidatorConstants} from "./interfaces/ISignatureValidator.sol";
 import {SafeMath} from "./external/SafeMath.sol";
 

contracts/base/Executor.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity >=0.7.0 <0.9.0;
-import {Enum} from "../common/Enum.sol";
+import {Enum} from "../interfaces/IEnum.sol";
 
 /**
  * @title Executor - A contract that can execute transactions

contracts/base/GuardManager.sol

@@ -2,7 +2,7 @@
 /* solhint-disable one-contract-per-file */
 pragma solidity >=0.7.0 <0.9.0;
 
-import {Enum} from "../common/Enum.sol";
+import {Enum} from "../interfaces/IEnum.sol";
 import {SelfAuthorized} from "../common/SelfAuthorized.sol";
 import {IERC165} from "../interfaces/IERC165.sol";
 

contracts/base/ModuleManager.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity >=0.7.0 <0.9.0;
-import {Enum} from "../common/Enum.sol";
+import {Enum} from "../interfaces/IEnum.sol";
 import {SelfAuthorized} from "../common/SelfAuthorized.sol";
 import {Executor} from "./Executor.sol";
 import {GuardManager, Guard} from "./GuardManager.sol";

contracts/examples/guards/DebugTransactionGuard.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity >=0.7.0 <0.9.0;
 
-import {Enum} from "../../common/Enum.sol";
+import {Enum} from "../../interfaces/IEnum.sol";
 import {BaseGuard} from "../../base/GuardManager.sol";
 import {Safe} from "../../Safe.sol";
 

contracts/examples/guards/DelegateCallTransactionGuard.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity >=0.7.0 <0.9.0;
 
-import {Enum} from "../../common/Enum.sol";
+import {Enum} from "../../interfaces/IEnum.sol";
 import {BaseGuard} from "../../base/GuardManager.sol";
 
 /**

contracts/examples/guards/OnlyOwnersGuard.sol

@@ -2,12 +2,9 @@
 /* solhint-disable one-contract-per-file */
 pragma solidity >=0.7.0 <0.9.0;
 
-import {Enum} from "../../common/Enum.sol";
+import {Enum} from "../../interfaces/IEnum.sol";
 import {BaseGuard} from "../../base/GuardManager.sol";
-
-interface ISafe {
-    function isOwner(address owner) external view returns (bool);
-}
+import {ISafe} from "../../interfaces/ISafe.sol";
 
 /**
  * @title OnlyOwnersGuard - Only allows owners to execute transactions.

contracts/examples/guards/ReentrancyTransactionGuard.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity >=0.7.0 <0.9.0;
 
-import {Enum} from "../../common/Enum.sol";
+import {Enum} from "../../interfaces/IEnum.sol";
 import {BaseGuard} from "../../base/GuardManager.sol";
 
 /**

contracts/handler/CompatibilityFallbackHandler.sol

@@ -3,7 +3,7 @@ pragma solidity >=0.7.0 <0.9.0;
 
 import {TokenCallbackHandler} from "./TokenCallbackHandler.sol";
 import {ISignatureValidator} from "../interfaces/ISignatureValidator.sol";
-import {Safe} from "../Safe.sol";
+import {ISafe} from "../interfaces/ISafe.sol";
 import {HandlerContext} from "./HandlerContext.sol";
 
 /**
@@ -24,7 +24,7 @@ contract CompatibilityFallbackHandler is TokenCallbackHandler, ISignatureValidat
      * @return Message hash.
      */
     function getMessageHash(bytes memory message) public view returns (bytes32) {
-        return getMessageHashForSafe(Safe(payable(msg.sender)), message);
+        return getMessageHashForSafe(ISafe(payable(msg.sender)), message);
     }
 
     /**
@@ -33,7 +33,7 @@ contract CompatibilityFallbackHandler is TokenCallbackHandler, ISignatureValidat
      * @param message Message that should be encoded.
      * @return Encoded message.
      */
-    function encodeMessageDataForSafe(Safe safe, bytes memory message) public view returns (bytes memory) {
+    function encodeMessageDataForSafe(ISafe safe, bytes memory message) public view returns (bytes memory) {
         bytes32 safeMessageHash = keccak256(abi.encode(SAFE_MSG_TYPEHASH, keccak256(message)));
         return abi.encodePacked(bytes1(0x19), bytes1(0x01), safe.domainSeparator(), safeMessageHash);
     }
@@ -44,7 +44,7 @@ contract CompatibilityFallbackHandler is TokenCallbackHandler, ISignatureValidat
      * @param message Message that should be hashed.
      * @return Message hash.
      */
-    function getMessageHashForSafe(Safe safe, bytes memory message) public view returns (bytes32) {
+    function getMessageHashForSafe(ISafe safe, bytes memory message) public view returns (bytes32) {
         return keccak256(encodeMessageDataForSafe(safe, message));
     }
 
@@ -56,7 +56,7 @@ contract CompatibilityFallbackHandler is TokenCallbackHandler, ISignatureValidat
      */
     function isValidSignature(bytes32 _dataHash, bytes calldata _signature) public view override returns (bytes4) {
         // Caller should be a Safe
-        Safe safe = Safe(payable(msg.sender));
+        ISafe safe = ISafe(payable(msg.sender));
         bytes memory messageData = encodeMessageDataForSafe(safe, abi.encode(_dataHash));
         bytes32 messageHash = keccak256(messageData);
         if (_signature.length == 0) {
@@ -73,7 +73,7 @@ contract CompatibilityFallbackHandler is TokenCallbackHandler, ISignatureValidat
      */
     function getModules() external view returns (address[] memory) {
         // Caller should be a Safe
-        Safe safe = Safe(payable(msg.sender));
+        ISafe safe = ISafe(payable(msg.sender));
         (address[] memory array, ) = safe.getModulesPaginated(SENTINEL_MODULES, 10);
         return array;
     }
@@ -174,6 +174,6 @@ contract CompatibilityFallbackHandler is TokenCallbackHandler, ISignatureValidat
         bytes memory signatures,
         uint256 requiredSignatures
     ) public view {
-        Safe(payable(_manager())).checkNSignatures(_msgSender(), dataHash, signatures, requiredSignatures);
+        ISafe(payable(_manager())).checkNSignatures(_msgSender(), dataHash, signatures, requiredSignatures);
     }
 }

contracts/common/Enum.sol → contracts/interfaces/IEnum.sol

@@ -3,9 +3,9 @@ pragma solidity >=0.7.0 <0.9.0;
 
 /**
  * @title Enum - Collection of enums used in Safe contracts.
- * @author Richard Meissner - @rmeissner
+ * @author Shebin John - @remedcu
  */
-abstract contract Enum {
+interface Enum {
     enum Operation {
         Call,
         DelegateCall

contracts/interfaces/ISafe.sol

@@ -0,0 +1,146 @@
+// SPDX-License-Identifier: LGPL-3.0-only
+pragma solidity >=0.7.0 <0.9.0;
+
+import {Enum} from "./IEnum.sol";
+
+/**
+ * @title ISafe - A multisignature wallet interface with support for confirmations using signed messages based on EIP-712.
+ * @author Shebin John - @remedcu
+ */
+interface ISafe {
+    /**
+     * @notice Sets an initial storage of the Safe contract.
+     * @dev This method can only be called once.
+     *      If a proxy was created without setting up, anyone can call setup and claim the proxy.
+     * @param _owners List of Safe owners.
+     * @param _threshold Number of required confirmations for a Safe transaction.
+     * @param to Contract address for optional delegate call.
+     * @param data Data payload for optional delegate call.
+     * @param fallbackHandler Handler for fallback calls to this contract
+     * @param paymentToken Token that should be used for the payment (0 is ETH)
+     * @param payment Value that should be paid
+     * @param paymentReceiver Address that should receive the payment (or 0 if tx.origin)
+     */
+    function setup(
+        address[] calldata _owners,
+        uint256 _threshold,
+        address to,
+        bytes calldata data,
+        address fallbackHandler,
+        address paymentToken,
+        uint256 payment,
+        address payable paymentReceiver
+    ) external;
+
+    /** @notice Executes a `operation` {0: Call, 1: DelegateCall}} transaction to `to` with `value` (Native Currency)
+     *          and pays `gasPrice` * `gasLimit` in `gasToken` token to `refundReceiver`.
+     * @dev The fees are always transferred, even if the user transaction fails.
+     *      This method doesn't perform any sanity check of the transaction, such as:
+     *      - if the contract at `to` address has code or not
+     *      - if the `gasToken` is a contract or not
+     *      It is the responsibility of the caller to perform such checks.
+     * @param to Destination address of Safe transaction.
+     * @param value Ether value of Safe transaction.
+     * @param data Data payload of Safe transaction.
+     * @param operation Operation type of Safe transaction.
+     * @param safeTxGas Gas that should be used for the Safe transaction.
+     * @param baseGas Gas costs that are independent of the transaction execution(e.g. base transaction fee, signature check, payment of the refund)
+     * @param gasPrice Gas price that should be used for the payment calculation.
+     * @param gasToken Token address (or 0 if ETH) that is used for the payment.
+     * @param refundReceiver Address of receiver of gas payment (or 0 if tx.origin).
+     * @param signatures Signature data that should be verified.
+     *                   Can be packed ECDSA signature ({bytes32 r}{bytes32 s}{uint8 v}), contract signature (EIP-1271) or approved hash.
+     * @return success Boolean indicating transaction's success.
+     */
+    function execTransaction(
+        address to,
+        uint256 value,
+        bytes calldata data,
+        Enum.Operation operation,
+        uint256 safeTxGas,
+        uint256 baseGas,
+        uint256 gasPrice,
+        address gasToken,
+        address payable refundReceiver,
+        bytes memory signatures
+    ) external payable returns (bool success);
+
+    /**
+     * @notice Checks whether the signature provided is valid for the provided data and hash. Reverts otherwise.
+     * @param dataHash Hash of the data (could be either a message hash or transaction hash)
+     * @param signatures Signature data that should be verified.
+     *                   Can be packed ECDSA signature ({bytes32 r}{bytes32 s}{uint8 v}), contract signature (EIP-1271) or approved hash.
+     */
+    function checkSignatures(bytes32 dataHash, bytes memory signatures) external view;
+
+    /**
+     * @notice Checks whether the signature provided is valid for the provided data and hash. Reverts otherwise.
+     * @dev Since the EIP-1271 does an external call, be mindful of reentrancy attacks.
+     * @param executor Address that executing the transaction.
+     *        ⚠️⚠️⚠️ Make sure that the executor address is a legitmate executor.
+     *        Incorrectly passed the executor might reduce the threshold by 1 signature. ⚠️⚠️⚠️
+     * @param dataHash Hash of the data (could be either a message hash or transaction hash)
+     * @param signatures Signature data that should be verified.
+     *                   Can be packed ECDSA signature ({bytes32 r}{bytes32 s}{uint8 v}), contract signature (EIP-1271) or approved hash.
+     * @param requiredSignatures Amount of required valid signatures.
+     */
+    function checkNSignatures(address executor, bytes32 dataHash, bytes memory signatures, uint256 requiredSignatures) external view;
+
+    /**
+     * @notice Marks hash `hashToApprove` as approved.
+     * @dev This can be used with a pre-approved hash transaction signature.
+     *      IMPORTANT: The approved hash stays approved forever. There's no revocation mechanism, so it behaves similarly to ECDSA signatures
+     * @param hashToApprove The hash to mark as approved for signatures that are verified by this contract.
+     */
+    function approveHash(bytes32 hashToApprove) external;
+
+    /**
+     * @dev Returns the domain separator for this contract, as defined in the EIP-712 standard.
+     * @return bytes32 The domain separator hash.
+     */
+    function domainSeparator() external view returns (bytes32);
+
+    /**
+     * @notice Returns transaction hash to be signed by owners.
+     * @param to Destination address.
+     * @param value Ether value.
+     * @param data Data payload.
+     * @param operation Operation type.
+     * @param safeTxGas Gas that should be used for the safe transaction.
+     * @param baseGas Gas costs for data used to trigger the safe transaction.
+     * @param gasPrice Maximum gas price that should be used for this transaction.
+     * @param gasToken Token address (or 0 if ETH) that is used for the payment.
+     * @param refundReceiver Address of receiver of gas payment (or 0 if tx.origin).
+     * @param _nonce Transaction nonce.
+     * @return Transaction hash.
+     */
+    function getTransactionHash(
+        address to,
+        uint256 value,
+        bytes calldata data,
+        Enum.Operation operation,
+        uint256 safeTxGas,
+        uint256 baseGas,
+        uint256 gasPrice,
+        address gasToken,
+        address refundReceiver,
+        uint256 _nonce
+    ) external view returns (bytes32);
+
+    /**
+     * @dev External getter function for state variables.
+     */
+    // solhint-disable-next-line
+    function VERSION() external view returns (string memory);
+    function signedMessages(bytes32 messageHash) external view returns (uint256);
+
+    /**
+     * @dev External getter function for inherited functions.
+     */
+    function getModulesPaginated(address start, uint256 pageSize) external view returns (address[] memory array, address next);
+    function getThreshold() external view returns (uint256);
+    function isOwner(address owner) external view returns (bool);
+    function getOwners() external view returns (address[] memory);
+    function setFallbackHandler(address handler) external;
+    function setGuard(address guard) external;
+}

contracts/libraries/Safe130To141Migration.sol

@@ -3,10 +3,7 @@
 pragma solidity >=0.7.0 <0.9.0;
 
 import {SafeStorage} from "../libraries/SafeStorage.sol";
-
-interface ISafe {
-    function setFallbackHandler(address handler) external;
-}
+import {ISafe} from "../interfaces/ISafe.sol";
 
 /**
  * @title Migration Contract for Safe Upgrade

contracts/libraries/Safe150Migration.sol

@@ -4,13 +4,7 @@ pragma solidity >=0.7.0 <0.9.0;
 
 import {SafeStorage} from "../libraries/SafeStorage.sol";
 import {Guard} from "../base/GuardManager.sol";
-
-// Interface for interacting with the Safe contract
-interface ISafe {
-    function setFallbackHandler(address handler) external;
-
-    function setGuard(address guard) external;
-}
+import {ISafe} from "../interfaces/ISafe.sol";
 
 /**
  * @title Migration Contract for Safe Upgrade

contracts/libraries/SafeToL2Migration.sol

@@ -3,18 +3,8 @@
 pragma solidity >=0.7.0 <0.9.0;
 
 import {SafeStorage} from "../libraries/SafeStorage.sol";
-import {Enum} from "../common/Enum.sol";
-
-interface ISafe {
-    // solhint-disable-next-line
-    function VERSION() external view returns (string memory);
-
-    function setFallbackHandler(address handler) external;
-
-    function getOwners() external view returns (address[] memory);
-
-    function getThreshold() external view returns (uint256);
-}
+import {Enum} from "../interfaces/IEnum.sol";
+import {ISafe} from "../interfaces/ISafe.sol";
 
 /**
  * @title Migration Contract for updating a Safe from 1.1.1/1.3.0/1.4.1 versions to a L2 version. Useful when replaying a Safe from a non L2 network in a L2 network.

package.json

@@ -20,6 +20,7 @@
         "test": "hardhat test",
         "test:parallel": "hardhat test --parallel",
         "coverage": "hardhat coverage",
+        "codesize": "hardhat codesize",
         "benchmark": "npm run test benchmark/*.ts",
         "deploy-custom": "rm -rf deployments/custom && npm run deploy-all custom",
         "deploy-all": "hardhat deploy-contracts --network",