[#4] WIP: Add events, errors, logic in protocol mediator

5afe · Jun 20, 2023 · 6546e17 · 6546e17
1 parent 96f2067
commit 6546e17
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 8 deletions.
diff --git a/contracts/DataTypes.sol b/contracts/DataTypes.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.18;
 
 struct SafeProtocolAction {
-    address to;
+    address payable to;
     uint256 value;
     bytes data;
 }

diff --git a/contracts/SafeProtocolMediator.sol b/contracts/SafeProtocolMediator.sol
@@ -1,15 +1,26 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity ^0.8.18;
 import {ISafeProtocolMediator} from "./interfaces/Mediator.sol";
+import {ISafeProtocolModule} from "./interfaces/Components.sol";
+
 import {ISafe} from "./interfaces/Accounts.sol";
 import "./DataTypes.sol";
 import "@openzeppelin/contracts/access/Ownable2Step.sol";
 
 /**
- * @title
- * @notice
+ * @title TODO
+ * @notice TODO
  */
 contract SafeProtocolMediator is ISafeProtocolMediator, Ownable2Step {
+
+    mapping (address => uint) public nonces;
+
+    event ActionsExecuted(address safe, bytes32 metaHash);
+    event RootAccessActionsExecuted(address safe, bytes32 metaHash);
+
+    error InvalidNonce(address sender, uint256 nonce);
+    error ModuleRequiresRootAccess(address sender);
+
     constructor(address initalOwner) {
         _transferOwnership(initalOwner);
     }
@@ -24,7 +35,28 @@ contract SafeProtocolMediator is ISafeProtocolMediator, Ownable2Step {
     function executeTransaction(
         ISafe safe,
         SafeTransaction calldata transaction
-    ) external view override returns (bool success, bytes[] memory data) {}
+    ) external override returns (bool success, bytes[] memory data) {
+        // TODO: Check for re-entrancy attacks
+        // TODO: Validate metahash
+
+        if(ISafeProtocolModule(msg.sender).requiresRootAccess()){
+            revert ModuleRequiresRootAccess(msg.sender);
+        }
+
+        if(nonces[msg.sender] != transaction.nonce){
+            revert InvalidNonce(msg.sender, transaction.nonce);
+        }
+
+        nonces[msg.sender]++;
+
+        data = new bytes[](transaction.actions.length);
+        for (uint256 i = 0; i < transaction.actions.length; ++i) {
+            SafeProtocolAction memory safeProtocolAction = transaction.actions[i];
+            //TODO: Set data variable or update documentation
+            safe.execTransactionFromModule(safeProtocolAction.to, safeProtocolAction.value, safeProtocolAction.data, 0);
+        }
+        success = true;
+    }
 
     /**
      * @notice TODO
@@ -36,5 +68,23 @@ contract SafeProtocolMediator is ISafeProtocolMediator, Ownable2Step {
     function executeRootAccess(
         ISafe safe,
         SafeRootAccess calldata rootAccess
-    ) external view override returns (bool success, bytes[] memory data) {}
+    ) external override returns (bool success, bytes memory data) {
+        SafeProtocolAction memory safeProtocolAction = rootAccess.action;
+        // TODO: Set data variable or update documentation
+        // TODO: Check for re-entrancy attacks
+        // TODO: Validate metahash
+
+        // Re-confirm if this check if needed and correct.
+        if(!ISafeProtocolModule(msg.sender).requiresRootAccess()){
+            revert ModuleRequiresRootAccess(msg.sender);
+        }
+
+        if(nonces[msg.sender] != rootAccess.nonce){
+            revert InvalidNonce(msg.sender, rootAccess.nonce);
+        }
+
+        nonces[msg.sender]++;
+        data = "";
+        success = safe.execTransactionFromModule(safeProtocolAction.to, safeProtocolAction.value, safeProtocolAction.data, 1);
+    }
 }
diff --git a/contracts/interfaces/Mediator.sol b/contracts/interfaces/Mediator.sol
@@ -18,7 +18,7 @@ interface ISafeProtocolMediator {
      * @return data Array of bytes types returned upon the successful execution of all the actions. Size of array will be same as size of actions
      *         in case of succcessful execution. Empty if the call failed.
      */
-    function executeTransaction(ISafe safe, SafeTransaction calldata transaction) external view returns (bool success, bytes[] memory data);
+    function executeTransaction(ISafe safe, SafeTransaction calldata transaction) external returns (bool success, bytes[] memory data);
 
     /**
      * @notice TODO
@@ -28,5 +28,5 @@ interface ISafeProtocolMediator {
      * @return data Arbitrary length bytes data returned upon the successful execution. Size of array will be same as size of actions
      *         in case of succcessful execution. Empty if the call failed.
      */
-    function executeRootAccess(ISafe safe, SafeRootAccess calldata rootAccess) external view returns (bool success, bytes[] memory data);
+    function executeRootAccess(ISafe safe, SafeRootAccess calldata rootAccess) external returns (bool success, bytes memory data);
 }
diff --git a/contracts/test/TestModule.sol b/contracts/test/TestModule.sol
@@ -13,7 +13,7 @@ abstract contract BaseTestModule is ISafeProtocolModule {
 }
 
 contract TestModule is BaseTestModule {
-    function executeFromModule(ISafe safe, address payable to, uint256 value,bytes calldata data) external {
+    function executeFromModule(ISafe safe, address payable to, uint256 value, bytes calldata data) external {
         safe.execTransactionFromModule(to, value, data, 0);
     }
 }