Merge branch 'master' into patch-1

.eslintrc.js

@@ -33,13 +33,27 @@ module.exports = {
     "import/order": [
       "error",
       {
-        groups: [["builtin", "external"]],
+        groups: [
+          "builtin",
+          "external",
+          "internal",
+          "parent",
+          "sibling",
+          "index",
+          "object",
+          "type",
+        ],
         alphabetize: {
           order: "asc",
         },
+        "newlines-between": "always",
       },
     ],
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/no-empty-function": "off",
+    "@typescript-eslint/no-unused-vars": [
+      "error",
+      { ignoreRestSiblings: true },
+    ],
   },
 };

.nvmrc

@@ -1 +1 @@
-v16.0.0
+v18.0.0

.solhint.json

@@ -1,16 +1,17 @@
 {
-    "extends": "solhint:recommended",
-    "rules": {
-        "compiler-version": "off",
-        "func-visibility": [
-            "warn",
-            {
-                "ignoreConstructors": true
-            }
-        ],
-        "not-rely-on-time": "off",
-        "reason-string": "off",
-        "no-empty-blocks": "off",
-        "avoid-low-level-calls": "off"
-    }
+  "extends": "solhint:recommended",
+  "rules": {
+    "compiler-version": "off",
+    "func-visibility": [
+      "warn",
+      {
+        "ignoreConstructors": true
+      }
+    ],
+    "not-rely-on-time": "off",
+    "reason-string": "off",
+    "no-empty-blocks": "off",
+    "avoid-low-level-calls": "off",
+    "no-inline-assembly": "off"
+  }
 }

.solhintignore

@@ -0,0 +1 @@
+./contracts/test

contracts/core/GuardableModifier.sol

@@ -0,0 +1,96 @@
+// SPDX-License-Identifier: LGPL-3.0-only
+pragma solidity >=0.7.0 <0.9.0;
+
+import {Enum} from "@gnosis.pm/safe-contracts/contracts/common/Enum.sol";
+
+import {Guardable} from "../guard/Guardable.sol";
+import {IAvatar} from "../interfaces/IAvatar.sol";
+import {IGuard} from "../interfaces/IGuard.sol";
+import {Modifier} from "./Modifier.sol";
+import {Module} from "./Module.sol";
+
+abstract contract GuardableModifier is Module, Guardable, Modifier {
+  /// @dev Passes a transaction to be executed by the avatar.
+  /// @notice Can only be called by this contract.
+  /// @param to Destination address of module transaction.
+  /// @param value Ether value of module transaction.
+  /// @param data Data payload of module transaction.
+  /// @param operation Operation type of module transaction: 0 == call, 1 == delegate call.
+  function exec(
+    address to,
+    uint256 value,
+    bytes memory data,
+    Enum.Operation operation
+  ) internal virtual override returns (bool success) {
+    address currentGuard = guard;
+    if (currentGuard != address(0)) {
+      IGuard(currentGuard).checkTransaction(
+        /// Transaction info used by module transactions.
+        to,
+        value,
+        data,
+        operation,
+        /// Zero out the redundant transaction information only used for Safe multisig transctions.
+        0,
+        0,
+        0,
+        address(0),
+        payable(0),
+        "",
+        sentOrSignedByModule()
+      );
+    }
+    success = IAvatar(target).execTransactionFromModule(
+      to,
+      value,
+      data,
+      operation
+    );
+    if (currentGuard != address(0)) {
+      IGuard(currentGuard).checkAfterExecution(bytes32(0), success);
+    }
+  }
+
+  /// @dev Passes a transaction to be executed by the target and returns data.
+  /// @notice Can only be called by this contract.
+  /// @param to Destination address of module transaction.
+  /// @param value Ether value of module transaction.
+  /// @param data Data payload of module transaction.
+  /// @param operation Operation type of module transaction: 0 == call, 1 == delegate call.
+  function execAndReturnData(
+    address to,
+    uint256 value,
+    bytes memory data,
+    Enum.Operation operation
+  ) internal virtual override returns (bool success, bytes memory returnData) {
+    address currentGuard = guard;
+    if (currentGuard != address(0)) {
+      IGuard(currentGuard).checkTransaction(
+        /// Transaction info used by module transactions.
+        to,
+        value,
+        data,
+        operation,
+        /// Zero out the redundant transaction information only used for Safe multisig transctions.
+        0,
+        0,
+        0,
+        address(0),
+        payable(0),
+        "",
+        sentOrSignedByModule()
+      );
+    }
+
+    (success, returnData) = IAvatar(target).execTransactionFromModuleReturnData(
+      to,
+      value,
+      data,
+      operation
+    );
+
+    if (currentGuard != address(0)) {
+      IGuard(currentGuard).checkAfterExecution(bytes32(0), success);
+    }
+  }
+}

contracts/core/GuardableModule.sol

@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: LGPL-3.0-only
+pragma solidity >=0.7.0 <0.9.0;
+
+import {Enum} from "@gnosis.pm/safe-contracts/contracts/common/Enum.sol";
+import {IGuard} from "../interfaces/IGuard.sol";
+import {Guardable} from "../guard/Guardable.sol";
+import {Module} from "./Module.sol";
+import {IAvatar} from "../interfaces/IAvatar.sol";
+
+/// @title GuardableModule  - A contract that can pass messages to a Module Manager contract if enabled by that contract.
+abstract contract GuardableModule is Module, Guardable {
+  /// @dev Passes a transaction to be executed by the avatar.
+  /// @notice Can only be called by this contract.
+  /// @param to Destination address of module transaction.
+  /// @param value Ether value of module transaction.
+  /// @param data Data payload of module transaction.
+  /// @param operation Operation type of module transaction: 0 == call, 1 == delegate call.
+  function exec(
+    address to,
+    uint256 value,
+    bytes memory data,
+    Enum.Operation operation
+  ) internal override returns (bool success) {
+    address currentGuard = guard;
+    if (currentGuard != address(0)) {
+      IGuard(currentGuard).checkTransaction(
+        /// Transaction info used by module transactions.
+        to,
+        value,
+        data,
+        operation,
+        /// Zero out the redundant transaction information only used for Safe multisig transctions.
+        0,
+        0,
+        0,
+        address(0),
+        payable(0),
+        "",
+        msg.sender
+      );
+    }
+    success = IAvatar(target).execTransactionFromModule(
+      to,
+      value,
+      data,
+      operation
+    );
+    if (currentGuard != address(0)) {
+      IGuard(currentGuard).checkAfterExecution(bytes32(0), success);
+    }
+  }
+
+  /// @dev Passes a transaction to be executed by the target and returns data.
+  /// @notice Can only be called by this contract.
+  /// @param to Destination address of module transaction.
+  /// @param value Ether value of module transaction.
+  /// @param data Data payload of module transaction.
+  /// @param operation Operation type of module transaction: 0 == call, 1 == delegate call.
+  function execAndReturnData(
+    address to,
+    uint256 value,
+    bytes memory data,
+    Enum.Operation operation
+  ) internal virtual override returns (bool success, bytes memory returnData) {
+    address currentGuard = guard;
+    if (currentGuard != address(0)) {
+      IGuard(currentGuard).checkTransaction(
+        /// Transaction info used by module transactions.
+        to,
+        value,
+        data,
+        operation,
+        /// Zero out the redundant transaction information only used for Safe multisig transctions.
+        0,
+        0,
+        0,
+        address(0),
+        payable(0),
+        "",
+        msg.sender
+      );
+    }
+
+    (success, returnData) = IAvatar(target).execTransactionFromModuleReturnData(
+      to,
+      value,
+      data,
+      operation
+    );
+
+    if (currentGuard != address(0)) {
+      IGuard(currentGuard).checkAfterExecution(bytes32(0), success);
+    }
+  }
+}