refactor and update test

bcnmy · Jul 7, 2024 · 48176cb · 48176cb
1 parent de62519
commit 48176cb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/contracts/base/ExecutionHelper.sol b/contracts/base/ExecutionHelper.sol
@@ -197,11 +197,14 @@ contract ExecutionHelper is IExecutionHelperEventsAndErrors {
     /// @param execType The execution type, which can be DEFAULT (revert on failure) or TRY (return on failure).
     function _handleDelegateCallExecutionAndReturnData(bytes calldata executionCalldata, ExecType execType) internal returns(bytes[] memory returnData) {
         (address delegate, bytes calldata callData) = executionCalldata.decodeDelegateCall();
+        returnData = new bytes[](1);
+        bool success;
         if (execType == EXECTYPE_DEFAULT) { 
             returnData[0] = _executeDelegatecall(delegate, callData);
         }
         else if (execType == EXECTYPE_TRY) {
-            (, returnData[0]) = _tryExecuteDelegatecall(delegate, callData);
+            (success, returnData[0]) = _tryExecuteDelegatecall(delegate, callData);
+            if (!success) emit TryDelegateCallUnsuccessful(0, returnData[0]);
         }
         else revert UnsupportedExecType(execType);
     }

diff --git a/contracts/interfaces/base/IExecutionHelperEventsAndErrors.sol b/contracts/interfaces/base/IExecutionHelperEventsAndErrors.sol
@@ -28,6 +28,9 @@ interface IExecutionHelperEventsAndErrors {
     /// @notice Event emitted when a transaction fails to execute successfully.
     event TryExecuteUnsuccessful(uint256 batchExecutionindex, bytes result);
 
+    /// @notice Event emitted when a transaction fails to execute successfully.
+    event TryDelegateCallUnsuccessful(uint256 batchExecutionindex, bytes result);
+
     /// @notice Error thrown when an execution with an unsupported ExecType was made.
     /// @param execType The unsupported execution type.
     error UnsupportedExecType(ExecType execType);

diff --git a/test/foundry/unit/concrete/accountexecution/TestAccountExecution_ExecuteFromExecutor.t.sol b/test/foundry/unit/concrete/accountexecution/TestAccountExecution_ExecuteFromExecutor.t.sol
@@ -52,19 +52,20 @@ contract TestAccountExecution_ExecuteFromExecutor is TestAccountExecution_Base {
     }
 
     /// @notice Tests delegate call execution via MockExecutor 
-    // function test_ExecuteDelegateCallFromExecutor_Success() public {
-
-    //     (bool res, ) = payable(address(BOB_ACCOUNT)).call{ value: 2 ether}(""); // Fund BOB_ACCOUNT
-    //     assertEq(res, true, "Funding BOB_ACCOUNT should succeed");
-
-    //     address valueTarget = makeAddr("valueTarget");
-    //     uint256 value = 1 ether;
-    //     bytes memory sendValueCallData =
-    //         abi.encodeWithSelector(MockDelegateTarget.sendValue.selector, valueTarget, value);
-    //     mockExecutor.execDelegatecall(BOB_ACCOUNT, sendValueCallData);
-    //     // Assert that the value was set ie that execution was successful
-    //     assertTrue(valueTarget.balance == value);
-    // }
+    // Review
+    function test_ExecuteDelegateCallFromExecutor_Success() public {
+
+        (bool res, ) = payable(address(BOB_ACCOUNT)).call{ value: 2 ether}(""); // Fund BOB_ACCOUNT
+        assertEq(res, true, "Funding BOB_ACCOUNT should succeed");
+
+        address valueTarget = makeAddr("valueTarget");
+        uint256 value = 1 ether;
+        bytes memory sendValueCallData =
+            abi.encodeWithSelector(MockDelegateTarget.sendValue.selector, valueTarget, value);
+        mockExecutor.execDelegatecall(BOB_ACCOUNT, sendValueCallData);
+        // Assert that the value was set ie that execution was successful
+        // assertTrue(valueTarget.balance == value);
+    }
 
     /// @notice Tests batch execution via MockExecutor
     function test_ExecBatchFromExecutor_Success() public {