feat: transient self-call memory in RT validation

alchemyplatform · Oct 11, 2024 · 357e567 · 357e567
1 parent 8a95166
commit 357e567
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 25 deletions.
diff --git a/.forge-snapshots/ModularAccount_Runtime_BatchTransfers.snap b/.forge-snapshots/ModularAccount_Runtime_BatchTransfers.snap
@@ -1 +1 @@
-93127
+93118
diff --git a/.forge-snapshots/ModularAccount_Runtime_Erc20Transfer.snap b/.forge-snapshots/ModularAccount_Runtime_Erc20Transfer.snap
@@ -1 +1 @@
-78552
+78543
diff --git a/.forge-snapshots/ModularAccount_Runtime_InstallSessionKey_Case1.snap b/.forge-snapshots/ModularAccount_Runtime_InstallSessionKey_Case1.snap
@@ -1 +1 @@
-424043
+424034
diff --git a/.forge-snapshots/ModularAccount_Runtime_NativeTransfer.snap b/.forge-snapshots/ModularAccount_Runtime_NativeTransfer.snap
@@ -1 +1 @@
-54701
+54692
diff --git a/.forge-snapshots/ModularAccount_Runtime_UseSessionKey_Case1_Counter.snap b/.forge-snapshots/ModularAccount_Runtime_UseSessionKey_Case1_Counter.snap
@@ -1 +1 @@
-79540
+79531
diff --git a/.forge-snapshots/ModularAccount_Runtime_UseSessionKey_Case1_Token.snap b/.forge-snapshots/ModularAccount_Runtime_UseSessionKey_Case1_Token.snap
@@ -1 +1 @@
-113098
+113089
diff --git a/.forge-snapshots/SemiModularAccount_Runtime_BatchTransfers.snap b/.forge-snapshots/SemiModularAccount_Runtime_BatchTransfers.snap
@@ -1 +1 @@
-89614
+89286
diff --git a/.forge-snapshots/SemiModularAccount_Runtime_Erc20Transfer.snap b/.forge-snapshots/SemiModularAccount_Runtime_Erc20Transfer.snap
@@ -1 +1 @@
-75094
+74791
diff --git a/.forge-snapshots/SemiModularAccount_Runtime_InstallSessionKey_Case1.snap b/.forge-snapshots/SemiModularAccount_Runtime_InstallSessionKey_Case1.snap
@@ -1 +1 @@
-423069
+422778
diff --git a/.forge-snapshots/SemiModularAccount_Runtime_NativeTransfer.snap b/.forge-snapshots/SemiModularAccount_Runtime_NativeTransfer.snap
@@ -1 +1 @@
-51244
+50950
diff --git a/.forge-snapshots/SemiModularAccount_Runtime_UseSessionKey_Case1_Counter.snap b/.forge-snapshots/SemiModularAccount_Runtime_UseSessionKey_Case1_Counter.snap
@@ -1 +1 @@
-80038
+80029
diff --git a/.forge-snapshots/SemiModularAccount_Runtime_UseSessionKey_Case1_Token.snap b/.forge-snapshots/SemiModularAccount_Runtime_UseSessionKey_Case1_Token.snap
@@ -1 +1 @@
-113596
+113587
diff --git a/src/account/ModularAccountBase.sol b/src/account/ModularAccountBase.sol
@@ -134,14 +134,8 @@ abstract contract ModularAccountBase is
         DensePostHookData postHookData = _checkPermittedCallerAndAssociatedHooks();
 
         // execute the function, bubbling up any reverts
-        (bool execSuccess, bytes memory execReturnData) = execModule.call(msg.data);
-
-        if (!execSuccess) {
-            // Bubble up revert reasons from modules
-            assembly ("memory-safe") {
-                revert(add(execReturnData, 32), mload(execReturnData))
-            }
-        }
+        ExecutionLib.callBubbleOnRevertTransient(execModule, 0 wei, msg.data);
+        bytes memory execReturnData = ExecutionLib.collectReturnData();
 
         ExecutionLib.doCachedPostHooks(postHookData);
 
@@ -315,7 +309,7 @@ abstract contract ModularAccountBase is
 
         // Execute the call, reusing the already-allocated RT call buffers, if it exists.
         // In practice, this is cheaper than attempting to coalesce the (possibly two) buffers.
-        ExecutionLib.callBubbleOnRevert(address(this), 0 wei, ExecutionLib.getCallData(rtCallBuffer, data));
+        ExecutionLib.executeRuntimeSelfCall(rtCallBuffer, data);
         bytes memory returnData = ExecutionLib.collectReturnData();
 
         ExecutionLib.doCachedPostHooks(postHookData);

diff --git a/src/libraries/ExecutionLib.sol b/src/libraries/ExecutionLib.sol
@@ -434,7 +434,7 @@ library ExecutionLib {
         }
     }
 
-    function getCallData(RTCallBuffer buffer, bytes calldata data) internal pure returns (bytes memory) {
+    function executeRuntimeSelfCall(RTCallBuffer buffer, bytes calldata data) internal {
         bool bufferExists;
 
         assembly ("memory-safe") {
@@ -457,10 +457,11 @@ library ExecutionLib {
                 callData := add(buffer, 0xe4)
             }
 
-            return callData;
+            // Perform the call, bubbling up revert data on failure.
+            callBubbleOnRevert(address(this), 0, callData);
         } else {
-            // No buffer exists yet, just copy the data to memory and return it.
-            return data;
+            // No buffer exists yet, just copy the data to memory transiently and execute it.
+            callBubbleOnRevertTransient(address(this), 0, data);
         }
     }