resurface revert reason

Uniswap · Dec 20, 2023 · 753d11a · 753d11a
1 parent f00e616
commit 753d11a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/contracts/interfaces/IQuoter.sol b/contracts/interfaces/IQuoter.sol
@@ -17,7 +17,7 @@ interface IQuoter {
     error InsufficientAmountOut();
     error LockFailure();
     error NotSelf();
-    error UnexpectedRevertBytes();
+    error UnexpectedRevertBytes(bytes revertData);
 
     struct PoolDeltas {
         int128 currency0Delta;

diff --git a/contracts/lens/Quoter.sol b/contracts/lens/Quoter.sol
@@ -124,13 +124,13 @@ contract Quoter is IQuoter, ILockCallback {
     function validateRevertReason(bytes memory reason) private pure returns (bytes memory) {
         if (reason.length < MINIMUM_VALID_RESPONSE_LENGTH) {
             //if InvalidLockAcquiredSender()
-            if (reason.length == MINIMUM_CUSTOM_ERROR_LENGTH) {
+            if (reason.length <= MINIMUM_CUSTOM_ERROR_LENGTH) {
                 assembly {
                     revert(reason, 4)
                 }
             }
             if (reason.length < MINIMUM_REASON_LENGTH) {
-                revert UnexpectedRevertBytes();
+                revert UnexpectedRevertBytes(reason);
             }
             assembly {
                 reason := add(reason, 0x04)