bubble up error

Uniswap · Dec 5, 2023 · 0c3849c · 0c3849c
1 parent ade91d1
commit 0c3849c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecute.snap b/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecute.snap
@@ -1 +1 @@
-288585
+288593
diff --git a/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecuteWithNativeAsOutput.snap b/.forge-snapshots/RelayOrderReactorIntegrationTest-testExecuteWithNativeAsOutput.snap
@@ -1 +1 @@
-291179
+291187
diff --git a/.forge-snapshots/RelayOrderReactorIntegrationTest-testPermitAndExecute.snap b/.forge-snapshots/RelayOrderReactorIntegrationTest-testPermitAndExecute.snap
@@ -1 +1 @@
-340631
+340639
diff --git a/src/reactors/RelayOrderReactor.sol b/src/reactors/RelayOrderReactor.sol
@@ -69,8 +69,13 @@ contract RelayOrderReactor is ReactorEvents, ReactorErrors, ReentrancyGuard, IRe
             for (uint256 j = 0; j < actionsLength;) {
                 (address target, uint256 value, bytes memory data) =
                     abi.decode(order.actions[j], (address, uint256, bytes));
-                (bool success,) = target.call{value: value}(data);
-                if (!success) revert CallFailed();
+                (bool success, bytes memory result) = target.call{value: value}(data);
+                if (!success) {
+                    // bubble up all errors, including custom errors which are encoded like functions
+                    assembly {
+                        revert(add(result, 0x20), mload(result))
+                    }
+                }
                 unchecked {
                     j++;
                 }