propagate error with delegateCallChecked

Author: d10r

packages/ethereum-contracts/contracts/libs/CallUtils.sol

@@ -10,8 +10,10 @@ pragma solidity ^0.8.23;
 */
 function delegateCallChecked(address target, bytes memory callData) {
     // solhint-disable-next-line avoid-low-level-calls
-    (bool success,) = target.delegatecall(callData);
-    require(success, "CallUtils: delegatecall failed");
+    (bool success, bytes memory returnedData) = target.delegatecall(callData);
+    if (!success) {
+        CallUtils.revertFromReturnedData(returnedData);
+    }
 }
 
 /**

packages/ethereum-contracts/test/foundry/libs/CallUtils.t.sol

@@ -17,6 +17,16 @@ contract DelegateCallTarget {
     function revertAlways() external pure {
         revert("Target revert");
     }
+
+    function revertWithCustomError() external pure {
+        revert CustomError("Custom error message");
+    }
+
+    function panicAlways() external pure {
+        assert(false);
+    }
+
+    error CustomError(string message);
 }
 
 // Contract that uses delegateCallChecked
@@ -30,6 +40,14 @@ contract DelegateCallChecker {
     function delegateCallRevert(address target) external {
         delegateCallChecked(target, abi.encodeWithSelector(DelegateCallTarget.revertAlways.selector));
     }
+
+    function delegateCallCustomError(address target) external {
+        delegateCallChecked(target, abi.encodeWithSelector(DelegateCallTarget.revertWithCustomError.selector));
+    }
+
+    function delegateCallPanic(address target) external {
+        delegateCallChecked(target, abi.encodeWithSelector(DelegateCallTarget.panicAlways.selector));
+    }
 }
 
 contract CallUtilsAnvil is Test {
@@ -59,10 +77,36 @@ contract CallUtilsAnvil is Test {
         DelegateCallTarget target = new DelegateCallTarget();
         DelegateCallChecker checker = new DelegateCallChecker();
 
-        vm.expectRevert("CallUtils: delegatecall failed");
+        // Verify that the actual error message is propagated
+        vm.expectRevert("Target revert");
         checker.delegateCallRevert(address(target));
     }
 
+    function testDelegateCallChecked_CustomError() public {
+        DelegateCallTarget target = new DelegateCallTarget();
+        DelegateCallChecker checker = new DelegateCallChecker();
+
+        // Verify that custom errors are properly propagated
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                DelegateCallTarget.CustomError.selector,
+                "Custom error message"
+            )
+        );
+        checker.delegateCallCustomError(address(target));
+    }
+
+    function testDelegateCallChecked_Panic() public {
+        DelegateCallTarget target = new DelegateCallTarget();
+        DelegateCallChecker checker = new DelegateCallChecker();
+
+        // Verify that panic errors are properly propagated with error information
+        // Panic code 0x01 is for assert(false)
+        // The error should be formatted as "CallUtils: target panicked: 0x01"
+        vm.expectRevert("CallUtils: target panicked: 0x01");
+        checker.delegateCallPanic(address(target));
+    }
+
     // TODO this is a hard fuzzing case, because we need to know if there is a case that:
     // 1. CallUtils.isValidAbiEncodedBytes returns true
     // 2. and abi.decode reverts