Merge 7eacfe6 into 5a6aa44

contracts/Safe.sol

@@ -39,8 +39,7 @@ contract Safe is
     SecuredTokenTransfer,
     ISignatureValidatorConstants,
     FallbackManager,
-    StorageAccessible,
-    GuardManager
+    StorageAccessible
 {
     using SafeMath for uint256;
 

contracts/base/GuardManager.sol

@@ -6,6 +6,18 @@ import "../common/SelfAuthorized.sol";
 import "../interfaces/IERC165.sol";
 
 interface Guard is IERC165 {
+    /// @dev Checks if a transaction should be allowed.
+    /// @param to The address of the recipient.
+    /// @param value The value of the transaction.
+    /// @param data The data of the transaction.
+    /// @param operation The operation type. 0 - CALL, 1 - DELEGATECALL
+    /// @param safeTxGas The gas limit for the transaction.
+    /// @param baseGas The base gas limit for the transaction.
+    /// @param gasPrice The gas price for the transaction.
+    /// @param gasToken The token used for paying gas.
+    /// @param refundReceiver The address that will receive the gas fees refund.
+    /// @param signatures The signatures of the transaction.
+    /// @param msgSender The sender of the message that triggered the transaction.
     function checkTransaction(
         address to,
         uint256 value,
@@ -20,13 +32,25 @@ interface Guard is IERC165 {
         address msgSender
     ) external;
 
+    /// @dev Checks if a module transaction should be allowed.
+    /// @param to The address of the recipient.
+    /// @param value The value of the transaction.
+    /// @param data The data of the transaction.
+    /// @param operation The operation type.
+    /// @param module The module that triggered the transaction.
+    function checkModuleTransaction(address to, uint256 value, bytes memory data, Enum.Operation operation, address module) external;
+
+    /// @dev Checks if a transaction was successful after execution.
+    /// @param txHash The hash of the transaction that was executed.
+    ///        In case of a module transaction, hash of the transaction call data.
+    /// @param success Whether or not the transaction was successful.
     function checkAfterExecution(bytes32 txHash, bool success) external;
 }
 
 abstract contract BaseGuard is Guard {
     function supportsInterface(bytes4 interfaceId) external view virtual override returns (bool) {
         return
-            interfaceId == type(Guard).interfaceId || // 0xe6d7a83a
+            interfaceId == type(Guard).interfaceId || // 0x945b8148
             interfaceId == type(IERC165).interfaceId; // 0x01ffc9a7
     }
 }

contracts/base/ModuleManager.sol

@@ -3,6 +3,7 @@ pragma solidity >=0.7.0 <0.9.0;
 import "../common/Enum.sol";
 import "../common/SelfAuthorized.sol";
 import "./Executor.sol";
+import "./GuardManager.sol";
 
 /**
  * @title Module Manager - A contract managing Safe modules
@@ -13,7 +14,7 @@ import "./Executor.sol";
  * @author Stefan George - @Georgi87
  * @author Richard Meissner - @rmeissner
  */
-abstract contract ModuleManager is SelfAuthorized, Executor {
+abstract contract ModuleManager is SelfAuthorized, Executor, GuardManager {
     event EnabledModule(address indexed module);
     event DisabledModule(address indexed module);
     event ExecutionFromModuleSuccess(address indexed module);
@@ -87,7 +88,16 @@ abstract contract ModuleManager is SelfAuthorized, Executor {
         // Only whitelisted modules are allowed.
         require(msg.sender != SENTINEL_MODULES && modules[msg.sender] != address(0), "GS104");
         // Execute transaction without further confirmations.
+        address guard = getGuard();
+
+        if (guard != address(0)) {
+            Guard(guard).checkModuleTransaction(to, value, data, operation, msg.sender);
+        }
         success = execute(to, value, data, operation, type(uint256).max);
+
+        if (guard != address(0)) {
+            Guard(guard).checkAfterExecution(keccak256(data), success);
+        }
         if (success) emit ExecutionFromModuleSuccess(msg.sender);
         else emit ExecutionFromModuleFailure(msg.sender);
     }

contracts/examples/guards/DebugTransactionGuard.sol

@@ -85,4 +85,20 @@ contract DebugTransactionGuard is BaseGuard {
         txNonces[txHash] = 0;
         emit GasUsage(msg.sender, txHash, nonce, success);
     }
+
+    /**
+     * @notice Called by the Safe contract before a transaction is executed via a module.
+     * @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 msgSender Account executing the transaction.
+     */
+    function checkModuleTransaction(
+        address to,
+        uint256 value,
+        bytes memory data,
+        Enum.Operation operation,
+        address msgSender
+    ) external override {}
 }

contracts/examples/guards/DelegateCallTransactionGuard.sol

@@ -46,4 +46,20 @@ contract DelegateCallTransactionGuard is BaseGuard {
     }
 
     function checkAfterExecution(bytes32, bool) external view override {}
+
+    /**
+     * @notice Called by the Safe contract before a transaction is executed via a module.
+     * @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 msgSender Account executing the transaction.
+     */
+    function checkModuleTransaction(
+        address to,
+        uint256 value,
+        bytes memory data,
+        Enum.Operation operation,
+        address msgSender
+    ) external override {}
 }

contracts/examples/guards/OnlyOwnersGuard.sol

@@ -56,4 +56,20 @@ contract OnlyOwnersGuard is BaseGuard {
     }
 
     function checkAfterExecution(bytes32, bool) external view override {}
+
+    /**
+     * @notice Called by the Safe contract before a transaction is executed via a module.
+     * @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 msgSender Account executing the transaction.
+     */
+    function checkModuleTransaction(
+        address to,
+        uint256 value,
+        bytes memory data,
+        Enum.Operation operation,
+        address msgSender
+    ) external override {}
 }

contracts/examples/guards/ReentrancyTransactionGuard.sol

@@ -66,4 +66,20 @@ contract ReentrancyTransactionGuard is BaseGuard {
     function checkAfterExecution(bytes32, bool) external override {
         getGuard().active = false;
     }
+
+    /**
+     * @notice Called by the Safe contract before a transaction is executed via a module.
+     * @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 msgSender Account executing the transaction.
+     */
+    function checkModuleTransaction(
+        address to,
+        uint256 value,
+        bytes memory data,
+        Enum.Operation operation,
+        address msgSender
+    ) external override {}
 }

contracts/test/TestImports.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: LGPL-3.0-only
+
+pragma solidity >=0.7.0 <0.9.0;
+
+// Import the contract so hardhat compiles it, and we have the ABI available
+import {MockContract} from "@safe-global/mock-contract/contracts/MockContract.sol";

contracts/test/Token.sol

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity >=0.6.0 <0.7.0;
-import "@gnosis.pm/mock-contract/contracts/MockContract.sol";
 
 interface Token {
     function transfer(address _to, uint256 value) external returns (bool);

package.json

@@ -45,7 +45,7 @@
         "url": "https://github.com/safe-global/safe-contracts/issues"
     },
     "devDependencies": {
-        "@gnosis.pm/mock-contract": "^4.0.0",
+        "@safe-global/mock-contract": "^4.0.0",
         "@gnosis.pm/safe-singleton-factory": "^1.0.14",
         "@nomiclabs/hardhat-ethers": "2.0.2",
         "@nomiclabs/hardhat-etherscan": "^3.1.7",