feat: implement delegatecall on executor base

rhinestonewtf · Feb 25, 2024 · 9a03e68 · 9a03e68
1 parent 2ceb1c6
commit 9a03e68
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/packages/modulekit/src/external/ERC7579.sol b/packages/modulekit/src/external/ERC7579.sol
@@ -25,6 +25,7 @@ import {
     ModePayload,
     CALLTYPE_SINGLE,
     CALLTYPE_BATCH,
+    CALLTYPE_DELEGATECALL,
     EXECTYPE_DEFAULT,
     MODE_DEFAULT
 } from "erc7579/lib/ModeLib.sol";

diff --git a/packages/modulekit/src/modules/ERC7579ExecutorBase.sol b/packages/modulekit/src/modules/ERC7579ExecutorBase.sol
@@ -58,4 +58,35 @@ abstract contract ERC7579ExecutorBase is IERC7579Executor, ERC7579ModuleBase {
     function _execute(Execution[] memory execs) internal returns (bytes[] memory results) {
         return _execute(msg.sender, execs);
     }
+
+    // Note: Not every account will support delegatecalls
+    function _executeDelegateCall(
+        address account,
+        address delegateTarget,
+        bytes memory callData
+    )
+        internal
+        returns (bytes[] memory results)
+    {
+        ModeCode modeCode = ERC7579ModeLib.encode({
+            callType: CALLTYPE_DELEGATECALL,
+            execType: EXECTYPE_DEFAULT,
+            mode: MODE_DEFAULT,
+            payload: ModePayload.wrap(bytes22(0))
+        });
+        results = IERC7579Account(account).executeFromExecutor(
+            modeCode, abi.encodePacked(delegateTarget, callData)
+        );
+    }
+
+    // Note: Not every account will support delegatecalls
+    function _executeDelegateCall(
+        address delegateTarget,
+        bytes memory callData
+    )
+        internal
+        returns (bytes[] memory results)
+    {
+        return _executeDelegateCall(msg.sender, delegateTarget, callData);
+    }
 }