Uniswap · hensha256 · May 14, 2024 · May 14, 2024 · May 14, 2024 · hensha256
diff --git a/.forge-snapshots/add liquidity to already existing position with salt.snap b/.forge-snapshots/add liquidity to already existing position with salt.snap
@@ -1 +1 @@
-151168
+151174
diff --git a/.forge-snapshots/addLiquidity CA fee.snap b/.forge-snapshots/addLiquidity CA fee.snap
@@ -1 +1 @@
-329534
+329540
diff --git a/.forge-snapshots/addLiquidity with empty hook.snap b/.forge-snapshots/addLiquidity with empty hook.snap
@@ -1 +1 @@
-284169
+284175
diff --git a/.forge-snapshots/addLiquidity with native token.snap b/.forge-snapshots/addLiquidity with native token.snap
@@ -1 +1 @@
-141301
+141307
diff --git a/.forge-snapshots/addLiquidity.snap b/.forge-snapshots/addLiquidity.snap
@@ -1 +1 @@
-151144
+151150
diff --git a/.forge-snapshots/create new liquidity to a position with salt.snap b/.forge-snapshots/create new liquidity to a position with salt.snap
@@ -1 +1 @@
-299696
+299702
diff --git a/.forge-snapshots/donate gas with 1 token.snap b/.forge-snapshots/donate gas with 1 token.snap
@@ -1 +1 @@
-108690
+108696
diff --git a/.forge-snapshots/donate gas with 2 tokens.snap b/.forge-snapshots/donate gas with 2 tokens.snap
@@ -1 +1 @@
-149228
+149234
diff --git a/.forge-snapshots/initialize.snap b/.forge-snapshots/initialize.snap
@@ -1 +1 @@
-62239
+62245
diff --git a/.forge-snapshots/poolManager bytecode size.snap b/.forge-snapshots/poolManager bytecode size.snap
@@ -1 +1 @@
-24031
+23891
diff --git a/.forge-snapshots/removeLiquidity CA fee.snap b/.forge-snapshots/removeLiquidity CA fee.snap
@@ -1 +1 @@
-185021
+185027
diff --git a/.forge-snapshots/removeLiquidity with empty hook.snap b/.forge-snapshots/removeLiquidity with empty hook.snap
@@ -1 +1 @@
-121039
+121045
diff --git a/.forge-snapshots/removeLiquidity with native token.snap b/.forge-snapshots/removeLiquidity with native token.snap
@@ -1 +1 @@
-117814
+117820
diff --git a/.forge-snapshots/removeLiquidity.snap b/.forge-snapshots/removeLiquidity.snap
@@ -1 +1 @@
-121027
+121033
diff --git a/.forge-snapshots/simple swap with native.snap b/.forge-snapshots/simple swap with native.snap
@@ -1 +1 @@
-117517
+117523
diff --git a/.forge-snapshots/simple swap.snap b/.forge-snapshots/simple swap.snap
@@ -1 +1 @@
-132756
+132762
diff --git a/.forge-snapshots/swap CA custom curve + swap noop.snap b/.forge-snapshots/swap CA custom curve + swap noop.snap
@@ -1 +1 @@
-136229
+135805
diff --git a/.forge-snapshots/swap CA fee on unspecified.snap b/.forge-snapshots/swap CA fee on unspecified.snap
@@ -1 +1 @@
-185023
+185029
diff --git a/.forge-snapshots/swap against liquidity with native token.snap b/.forge-snapshots/swap against liquidity with native token.snap
@@ -1 +1 @@
-113970
+113976
diff --git a/.forge-snapshots/swap against liquidity.snap b/.forge-snapshots/swap against liquidity.snap
@@ -1 +1 @@
-125391
+125397
diff --git a/.forge-snapshots/swap burn 6909 for input.snap b/.forge-snapshots/swap burn 6909 for input.snap
@@ -1 +1 @@
-137393
+137399
diff --git a/.forge-snapshots/swap burn native 6909 for input.snap b/.forge-snapshots/swap burn native 6909 for input.snap
@@ -1 +1 @@
-126493
+126499
diff --git a/.forge-snapshots/swap mint native output as 6909.snap b/.forge-snapshots/swap mint native output as 6909.snap
@@ -1 +1 @@
-148571
+148577
diff --git a/.forge-snapshots/swap mint output as 6909.snap b/.forge-snapshots/swap mint output as 6909.snap
@@ -1 +1 @@
-165380
+165386
diff --git a/.forge-snapshots/swap skips hook call if hook is caller.snap b/.forge-snapshots/swap skips hook call if hook is caller.snap
@@ -1 +1 @@
-225454
+225012
diff --git a/.forge-snapshots/swap with dynamic fee.snap b/.forge-snapshots/swap with dynamic fee.snap
@@ -1 +1 @@
-149647
+149653
diff --git a/.forge-snapshots/swap with hooks.snap b/.forge-snapshots/swap with hooks.snap
@@ -1 +1 @@
-125403
+125409
diff --git a/.forge-snapshots/swap with lp fee and protocol fee.snap b/.forge-snapshots/swap with lp fee and protocol fee.snap
@@ -1 +1 @@
-182375
+181943
diff --git a/.forge-snapshots/swap with return dynamic fee.snap b/.forge-snapshots/swap with return dynamic fee.snap
@@ -1 +1 @@
-157794
+157355
diff --git a/.forge-snapshots/update dynamic fee in before swap.snap b/.forge-snapshots/update dynamic fee in before swap.snap
@@ -1 +1 @@
-160612
+160180
diff --git a/src/libraries/Hooks.sol b/src/libraries/Hooks.sol
@@ -148,21 +148,6 @@ library Hooks {
         (, delta) = abi.decode(result, (bytes4, int256));
     }
 
-    /// @notice performs a hook call using the given calldata on the given hook
-    /// @return delta The delta returned by the hook
-    /// @return fee The fee returned by the hook
-    function callHookWithReturnDeltaAndFee(IHooks self, bytes memory data, bool parseReturn)
-        internal
-        returns (int256 delta, uint24 fee)
-    {
-        bytes memory result = callHook(self, data);
-        (, delta, fee) = abi.decode(result, (bytes4, int256, uint24));
-
-        if (!parseReturn) {
-            delta = 0;
-        }
-    }
-
     /// @notice modifier to prevent calling a hook if they initiated the action
     modifier noSelfCall(IHooks self) {
         if (msg.sender != address(self)) {
@@ -258,17 +243,22 @@ library Hooks {
         if (msg.sender == address(self)) return (amountToSwap, BeforeSwapDeltaLibrary.ZERO_DELTA, lpFee);
 
         if (self.hasPermission(BEFORE_SWAP_FLAG)) {
-            bool canReturnDelta = self.hasPermission(BEFORE_SWAP_RETURNS_DELTA_FLAG);
-            (int256 result, uint24 _lpFee) = self.callHookWithReturnDeltaAndFee(
-                abi.encodeWithSelector(IHooks.beforeSwap.selector, msg.sender, key, params, hookData),
-                canReturnDelta
-            );
-            if (key.fee.isDynamicFee()) lpFee = _lpFee;
+            bytes memory result =
+                callHook(self, abi.encodeWithSelector(IHooks.beforeSwap.selector, msg.sender, key, params, hookData));
 
-            hookReturn = BeforeSwapDelta.wrap(result);
+            if (key.fee.isDynamicFee()) {
+                // equivalent: (,, lpFee) = abi.decode(result, (bytes4, int256, uint24));
+                assembly {
+                    lpFee := mload(add(result, 0x60))
+                }
+            }
 
             // skip this logic for the case where the hook return is 0
-            if (canReturnDelta) {
+            if (self.hasPermission(BEFORE_SWAP_RETURNS_DELTA_FLAG)) {
+                // equivalent: (, hookReturn, ) = abi.decode(result, (bytes4, int256, uint24));
+                assembly {
+                    hookReturn := mload(add(result, 0x40))
+                }
                 // any return in unspecified is passed to the afterSwap hook for handling
                 int128 hookDeltaSpecified = hookReturn.getSpecifiedDelta();
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		136229
		135805
Copy link Contributor Author hensha256 May 14, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. key gas to look at
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		225454
		225012
Copy link Contributor Author hensha256 May 14, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. key gas to look at
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		182375
		181943
Copy link Contributor Author hensha256 May 14, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. key gas to look at
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		157794
		157355
Copy link Contributor Author hensha256 May 14, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. key gas to look at Copy link Collaborator saucepoint May 14, 2024 • edited Loading Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. 3,257!!! 😮‍💨 but i dont know if we should use the new gas (since its lower)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		160612
		160180
Copy link Contributor Author hensha256 May 14, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. key gas to look at