Merge branch 'main' into posm-modifyLiquiditiesWithoutUnlock-tests

Uniswap · Aug 5, 2024 · c75bcf5 · c75bcf5
2 parents c31e24c + af688af
commit c75bcf5
Show file tree

Hide file tree

Showing 52 changed files with 100 additions and 63 deletions.
diff --git a/.forge-snapshots/BaseActionsRouter_mock10commands.snap b/.forge-snapshots/BaseActionsRouter_mock10commands.snap
@@ -1 +1 @@
-61794
+61749
diff --git a/.forge-snapshots/PositionManager_burn_empty.snap b/.forge-snapshots/PositionManager_burn_empty.snap
@@ -1 +1 @@
-47224
+47170
diff --git a/.forge-snapshots/PositionManager_burn_empty_native.snap b/.forge-snapshots/PositionManager_burn_empty_native.snap
@@ -1 +1 @@
-47041
+46988
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_native_withClose.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_native_withClose.snap
@@ -1 +1 @@
-123166
+123220
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_native_withTakePair.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_native_withTakePair.snap
@@ -1 +1 @@
-122673
+122727
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_withClose.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_withClose.snap
@@ -1 +1 @@
-130244
+130298
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_withTakePair.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_withTakePair.snap
@@ -1 +1 @@
-129752
+129805
diff --git a/.forge-snapshots/PositionManager_collect_native.snap b/.forge-snapshots/PositionManager_collect_native.snap
@@ -1 +1 @@
-141601
+141690
diff --git a/.forge-snapshots/PositionManager_collect_sameRange.snap b/.forge-snapshots/PositionManager_collect_sameRange.snap
@@ -1 +1 @@
-150449
+150538
diff --git a/.forge-snapshots/PositionManager_collect_withClose.snap b/.forge-snapshots/PositionManager_collect_withClose.snap
@@ -1 +1 @@
-150449
+150538
diff --git a/.forge-snapshots/PositionManager_collect_withTakePair.snap b/.forge-snapshots/PositionManager_collect_withTakePair.snap
@@ -1 +1 @@
-149821
+149910
diff --git a/.forge-snapshots/PositionManager_decreaseLiquidity_native.snap b/.forge-snapshots/PositionManager_decreaseLiquidity_native.snap
@@ -1 +1 @@
-108756
+108827
diff --git a/.forge-snapshots/PositionManager_decreaseLiquidity_withClose.snap b/.forge-snapshots/PositionManager_decreaseLiquidity_withClose.snap
@@ -1 +1 @@
-115992
+116081
diff --git a/.forge-snapshots/PositionManager_decreaseLiquidity_withTakePair.snap b/.forge-snapshots/PositionManager_decreaseLiquidity_withTakePair.snap
@@ -1 +1 @@
-115364
+115453
diff --git a/.forge-snapshots/PositionManager_decrease_burnEmpty.snap b/.forge-snapshots/PositionManager_decrease_burnEmpty.snap
@@ -1 +1 @@
-134324
+134377
diff --git a/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap b/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap
@@ -1 +1 @@
-127063
+127116
diff --git a/.forge-snapshots/PositionManager_decrease_sameRange_allLiquidity.snap b/.forge-snapshots/PositionManager_decrease_sameRange_allLiquidity.snap
@@ -1 +1 @@
-128708
+128797
diff --git a/.forge-snapshots/PositionManager_decrease_take_take.snap b/.forge-snapshots/PositionManager_decrease_take_take.snap
@@ -1 +1 @@
-116525
+116614
diff --git a/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withClose.snap b/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withClose.snap
@@ -1 +1 @@
-152577
+152488
diff --git a/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withSettlePair.snap b/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withSettlePair.snap
@@ -1 +1 @@
-151579
+151490
diff --git a/.forge-snapshots/PositionManager_increaseLiquidity_native.snap b/.forge-snapshots/PositionManager_increaseLiquidity_native.snap
@@ -1 +1 @@
-134377
+134288
diff --git a/.forge-snapshots/PositionManager_increase_autocompoundExactUnclaimedFees.snap b/.forge-snapshots/PositionManager_increase_autocompoundExactUnclaimedFees.snap
@@ -1 +1 @@
-130432
+130387
diff --git a/.forge-snapshots/PositionManager_increase_autocompoundExcessFeesCredit.snap b/.forge-snapshots/PositionManager_increase_autocompoundExcessFeesCredit.snap
@@ -1 +1 @@
-171214
+171303
diff --git a/.forge-snapshots/PositionManager_increase_autocompound_clearExcess.snap b/.forge-snapshots/PositionManager_increase_autocompound_clearExcess.snap
@@ -1 +1 @@
-141216
+141259
diff --git a/.forge-snapshots/PositionManager_mint_native.snap b/.forge-snapshots/PositionManager_mint_native.snap
@@ -1 +1 @@
-337055
+340631
diff --git a/.forge-snapshots/PositionManager_mint_nativeWithSweep_withClose.snap b/.forge-snapshots/PositionManager_mint_nativeWithSweep_withClose.snap
@@ -1 +1 @@
-345547
+349123
diff --git a/.forge-snapshots/PositionManager_mint_nativeWithSweep_withSettlePair.snap b/.forge-snapshots/PositionManager_mint_nativeWithSweep_withSettlePair.snap
@@ -1 +1 @@
-344849
+348425
diff --git a/.forge-snapshots/PositionManager_mint_onSameTickLower.snap b/.forge-snapshots/PositionManager_mint_onSameTickLower.snap
@@ -1 +1 @@
-315037
+318613
diff --git a/.forge-snapshots/PositionManager_mint_onSameTickUpper.snap b/.forge-snapshots/PositionManager_mint_onSameTickUpper.snap
@@ -1 +1 @@
-315679
+319255
diff --git a/.forge-snapshots/PositionManager_mint_sameRange.snap b/.forge-snapshots/PositionManager_mint_sameRange.snap
@@ -1 +1 @@
-241261
+244837
diff --git a/.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap b/.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap
@@ -1 +1 @@
-371079
+374655
diff --git a/.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap b/.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap
@@ -1 +1 @@
-321055
+324631
diff --git a/.forge-snapshots/PositionManager_mint_withClose.snap b/.forge-snapshots/PositionManager_mint_withClose.snap
@@ -1 +1 @@
-372355
+375931
diff --git a/.forge-snapshots/PositionManager_mint_withSettlePair.snap b/.forge-snapshots/PositionManager_mint_withSettlePair.snap
@@ -1 +1 @@
-371495
+375071
diff --git a/.forge-snapshots/PositionManager_multicall_initialize_mint.snap b/.forge-snapshots/PositionManager_multicall_initialize_mint.snap
@@ -1 +1 @@
-416851
+420405
diff --git a/.forge-snapshots/StateView_extsload_getFeeGrowthGlobals.snap b/.forge-snapshots/StateView_extsload_getFeeGrowthGlobals.snap
@@ -1 +1 @@
-2398
+2376
diff --git a/.forge-snapshots/StateView_extsload_getFeeGrowthInside.snap b/.forge-snapshots/StateView_extsload_getFeeGrowthInside.snap
@@ -1 +1 @@
-8543
+8455
diff --git a/.forge-snapshots/StateView_extsload_getLiquidity.snap b/.forge-snapshots/StateView_extsload_getLiquidity.snap
@@ -1 +1 @@
-1509
+1487
diff --git a/.forge-snapshots/StateView_extsload_getPositionInfo.snap b/.forge-snapshots/StateView_extsload_getPositionInfo.snap
@@ -1 +1 @@
-2927
+2905
diff --git a/.forge-snapshots/StateView_extsload_getPositionLiquidity.snap b/.forge-snapshots/StateView_extsload_getPositionLiquidity.snap
@@ -1 +1 @@
-1746
+1724
diff --git a/.forge-snapshots/StateView_extsload_getSlot0.snap b/.forge-snapshots/StateView_extsload_getSlot0.snap
@@ -1 +1 @@
-1606
+1584
diff --git a/.forge-snapshots/StateView_extsload_getTickBitmap.snap b/.forge-snapshots/StateView_extsload_getTickBitmap.snap
@@ -1 +1 @@
-1704
+1682
diff --git a/.forge-snapshots/StateView_extsload_getTickFeeGrowthOutside.snap b/.forge-snapshots/StateView_extsload_getTickFeeGrowthOutside.snap
@@ -1 +1 @@
-2756
+2734
diff --git a/.forge-snapshots/StateView_extsload_getTickInfo.snap b/.forge-snapshots/StateView_extsload_getTickInfo.snap
@@ -1 +1 @@
-3090
+3068
diff --git a/.forge-snapshots/StateView_extsload_getTickLiquidity.snap b/.forge-snapshots/StateView_extsload_getTickLiquidity.snap
@@ -1 +1 @@
-1901
+1879
diff --git a/.forge-snapshots/V4Router_Bytecode.snap b/.forge-snapshots/V4Router_Bytecode.snap
@@ -1 +1 @@
-8446
+8454
diff --git a/lib/v4-core b/lib/v4-core
diff --git a/src/PositionManager.sol b/src/PositionManager.sol
@@ -255,6 +255,8 @@ contract PositionManager is
         BalanceDelta liquidityDelta = _modifyLiquidity(config, liquidity.toInt256(), bytes32(tokenId), hookData);
         liquidityDelta.validateMaxIn(amount0Max, amount1Max);
         positionConfigs.setConfigId(tokenId, config);
+
+        emit MintPosition(tokenId, config);
     }
 
     /// @dev this is overloaded with ERC721Permit_v4._burn
@@ -358,7 +360,7 @@ contract PositionManager is
     }
 
     /// @dev overrides solmate transferFrom in case a notification to subscribers is needed
-    function transferFrom(address from, address to, uint256 id) public override {
+    function transferFrom(address from, address to, uint256 id) public virtual override {
         super.transferFrom(from, to, id);
         if (positionConfigs.hasSubscriber(id)) _notifyTransfer(id, from, to);
     }

diff --git a/src/base/Notifier.sol b/src/base/Notifier.sol
@@ -4,11 +4,10 @@ pragma solidity ^0.8.24;
 import {ISubscriber} from "../interfaces/ISubscriber.sol";
 import {PositionConfig} from "../libraries/PositionConfig.sol";
 import {BipsLibrary} from "../libraries/BipsLibrary.sol";
-import {INotifier, PositionConfig} from "../interfaces/INotifier.sol";
+import {INotifier} from "../interfaces/INotifier.sol";
 import {CustomRevert} from "@uniswap/v4-core/src/libraries/CustomRevert.sol";
 
 /// @notice Notifier is used to opt in to sending updates to external contracts about position modifications or transfers
-/// TODO: Use CustomRevert library when it supports subcontext's addresss
 abstract contract Notifier is INotifier {
     using BipsLibrary for uint256;
     using CustomRevert for bytes4;
@@ -35,10 +34,14 @@ abstract contract Notifier is INotifier {
         if (_subscriber != NO_SUBSCRIBER) revert AlreadySubscribed(address(_subscriber));
         subscriber[tokenId] = ISubscriber(newSubscriber);
 
-        try ISubscriber(newSubscriber).notifySubscribe(tokenId, config, data) {}
-        catch (bytes memory reason) {
-            revert Wrap__SubsciptionReverted(newSubscriber, reason);
+        bool success = _call(
+            address(newSubscriber), abi.encodeWithSelector(ISubscriber.notifySubscribe.selector, tokenId, config, data)
+        );
+
+        if (!success) {
+            Wrap__SubsciptionReverted.selector.bubbleUpAndRevertWith(address(newSubscriber));
         }
+
         emit Subscribed(tokenId, address(newSubscriber));
     }
 
@@ -56,17 +59,33 @@ abstract contract Notifier is INotifier {
 
     function _notifyModifyLiquidity(uint256 tokenId, PositionConfig memory config, int256 liquidityChange) internal {
         ISubscriber _subscriber = subscriber[tokenId];
-        try _subscriber.notifyModifyLiquidity(tokenId, config, liquidityChange) {}
-        catch (bytes memory reason) {
-            revert Wrap__ModifyLiquidityNotificationReverted(address(_subscriber), reason);
+
+        bool success = _call(
+            address(_subscriber),
+            abi.encodeWithSelector(ISubscriber.notifyModifyLiquidity.selector, tokenId, config, liquidityChange)
+        );
+
+        if (!success) {
+            Wrap__ModifyLiquidityNotificationReverted.selector.bubbleUpAndRevertWith(address(_subscriber));
         }
     }
 
     function _notifyTransfer(uint256 tokenId, address previousOwner, address newOwner) internal {
         ISubscriber _subscriber = subscriber[tokenId];
-        try _subscriber.notifyTransfer(tokenId, previousOwner, newOwner) {}
-        catch (bytes memory reason) {
-            revert Wrap__TransferNotificationReverted(address(_subscriber), reason);
+
+        bool success = _call(
+            address(_subscriber),
+            abi.encodeWithSelector(ISubscriber.notifyTransfer.selector, tokenId, previousOwner, newOwner)
+        );
+
+        if (!success) {
+            Wrap__TransferNotificationReverted.selector.bubbleUpAndRevertWith(address(_subscriber));
+        }
+    }
+
+    function _call(address target, bytes memory encodedCall) internal returns (bool success) {
+        assembly ("memory-safe") {
+            success := call(gas(), target, 0, add(encodedCall, 0x20), mload(encodedCall), 0, 0)
         }
     }
 }
diff --git a/src/interfaces/IPositionManager.sol b/src/interfaces/IPositionManager.sol
@@ -12,6 +12,8 @@ interface IPositionManager is INotifier {
     error DeadlinePassed();
     error IncorrectPositionConfigForTokenId(uint256 tokenId);
 
+    event MintPosition(uint256 indexed tokenId, PositionConfig config);
+
     /// @notice Unlocks Uniswap v4 PoolManager and batches actions for modifying liquidity
     /// @dev This is the standard entrypoint for the PositionManager
     /// @param payload is an encoding of actions, and parameters for those actions

diff --git a/test/position-managers/PositionManager.modifyLiquiditiesWithoutUnlock.t.sol b/test/position-managers/PositionManager.modifyLiquiditiesWithoutUnlock.t.sol
@@ -213,7 +213,8 @@ contract PositionManagerModifyLiquiditiesTest is Test, PosmTestSetup, LiquidityF
         // should revert because hook is not approved
         vm.expectRevert(
             abi.encodeWithSelector(
-                Hooks.FailedHookCall.selector,
+                Hooks.Wrap__FailedHookCall.selector,
+                address(hookModifyLiquidities),
                 abi.encodeWithSelector(IPositionManager.NotApproved.selector, address(hookModifyLiquidities))
             )
         );
@@ -237,7 +238,8 @@ contract PositionManagerModifyLiquiditiesTest is Test, PosmTestSetup, LiquidityF
         // should revert because hook is not approved
         vm.expectRevert(
             abi.encodeWithSelector(
-                Hooks.FailedHookCall.selector,
+                Hooks.Wrap__FailedHookCall.selector,
+                address(hookModifyLiquidities),
                 abi.encodeWithSelector(IPositionManager.NotApproved.selector, address(hookModifyLiquidities))
             )
         );
@@ -257,7 +259,8 @@ contract PositionManagerModifyLiquiditiesTest is Test, PosmTestSetup, LiquidityF
         // should revert because hook is not approved
         vm.expectRevert(
             abi.encodeWithSelector(
-                Hooks.FailedHookCall.selector,
+                Hooks.Wrap__FailedHookCall.selector,
+                address(hookModifyLiquidities),
                 abi.encodeWithSelector(IPositionManager.NotApproved.selector, address(hookModifyLiquidities))
             )
         );
@@ -495,7 +498,9 @@ contract PositionManagerModifyLiquiditiesTest is Test, PosmTestSetup, LiquidityF
         // should revert because hook is re-entering modifyLiquiditiesWithoutUnlock
         vm.expectRevert(
             abi.encodeWithSelector(
-                Hooks.FailedHookCall.selector, abi.encodeWithSelector(ReentrancyLock.ContractLocked.selector)
+                Hooks.Wrap__FailedHookCall.selector,
+                address(hookModifyLiquidities),
+                abi.encodeWithSelector(ReentrancyLock.ContractLocked.selector)
             )
         );
         lpm.modifyLiquidities(calls, _deadline);

diff --git a/test/position-managers/PositionManager.t.sol b/test/position-managers/PositionManager.t.sol
@@ -935,5 +935,14 @@ contract PositionManagerTest is Test, PosmTestSetup, LiquidityFuzzers {
         assertLt(uint256(int256(deltaDecrease.amount1())), uint256(int256(-deltaMint.amount1()))); // amount1 in the second position was greater than amount1 in the first position
     }
 
+    function test_mint_emits_event() public {
+        PositionConfig memory config = PositionConfig({poolKey: key, tickLower: -60, tickUpper: 60});
+        uint256 tokenId = lpm.nextTokenId();
+
+        vm.expectEmit(true, false, false, true, address(lpm));
+        emit IPositionManager.MintPosition(tokenId, config);
+        mint(config, 1e18, ActionConstants.MSG_SENDER, ZERO_BYTES);
+    }
+
     function test_mint_slippageRevert() public {}
 }
+1 −1		.forge-snapshots/add liquidity to already existing position with salt.snap
+1 −1		.forge-snapshots/addLiquidity CA fee.snap
+1 −1		.forge-snapshots/addLiquidity with empty hook.snap
+1 −1		.forge-snapshots/addLiquidity with native token.snap
+1 −1		.forge-snapshots/clear.snap
+1 −1		.forge-snapshots/create new liquidity to a position with salt.snap
+1 −1		.forge-snapshots/donate gas with 1 token.snap
+1 −1		.forge-snapshots/donate gas with 2 tokens.snap
+1 −1		.forge-snapshots/erc20 collect protocol fees.snap
+1 −1		.forge-snapshots/extsload getFeeGrowthGlobals.snap
+1 −1		.forge-snapshots/extsload getFeeGrowthInside.snap
+1 −1		.forge-snapshots/extsload getLiquidity.snap
+1 −1		.forge-snapshots/extsload getPositionInfo.snap
+1 −1		.forge-snapshots/extsload getPositionLiquidity.snap
+1 −1		.forge-snapshots/extsload getSlot0.snap
+1 −1		.forge-snapshots/extsload getTickBitmap.snap
+1 −1		.forge-snapshots/extsload getTickFeeGrowthOutside.snap
+1 −1		.forge-snapshots/extsload getTickInfo.snap
+1 −1		.forge-snapshots/extsload getTickLiquidity.snap
+1 −1		.forge-snapshots/getReserves.snap
+1 −1		.forge-snapshots/initialize.snap
+1 −1		.forge-snapshots/native collect protocol fees.snap
+1 −1		.forge-snapshots/poolManager bytecode size.snap
+1 −1		.forge-snapshots/removeLiquidity CA fee.snap
+1 −1		.forge-snapshots/removeLiquidity with empty hook.snap
+1 −1		.forge-snapshots/removeLiquidity with native token.snap
+1 −1		.forge-snapshots/simple addLiquidity second addition same range.snap
+1 −1		.forge-snapshots/simple addLiquidity.snap
+1 −1		.forge-snapshots/simple removeLiquidity some liquidity remains.snap
+1 −1		.forge-snapshots/simple removeLiquidity.snap
+1 −1		.forge-snapshots/simple swap with native.snap
+1 −1		.forge-snapshots/simple swap.snap
+1 −1		.forge-snapshots/swap CA custom curve + swap noop.snap
+1 −1		.forge-snapshots/swap CA fee on unspecified.snap
+1 −1		.forge-snapshots/swap against liquidity with native token.snap
+1 −1		.forge-snapshots/swap against liquidity.snap
+1 −1		.forge-snapshots/swap burn 6909 for input.snap
+1 −1		.forge-snapshots/swap burn native 6909 for input.snap
+1 −1		.forge-snapshots/swap mint native output as 6909.snap
+1 −1		.forge-snapshots/swap mint output as 6909.snap
+1 −1		.forge-snapshots/swap skips hook call if hook is caller.snap
+1 −1		.forge-snapshots/swap with dynamic fee.snap
+1 −1		.forge-snapshots/swap with hooks.snap
+1 −1		.forge-snapshots/swap with lp fee and protocol fee.snap
+1 −1		.forge-snapshots/swap with return dynamic fee.snap
+1 −1		.forge-snapshots/update dynamic fee in before swap.snap
+2 −4		src/PoolManager.sol
+0 −6		src/interfaces/IPoolManager.sol
+8 −7		src/libraries/CustomRevert.sol
+2 −2		src/libraries/Hooks.sol
+4 −4		src/libraries/StateLibrary.sol
+2 −4		src/test/ProxyPoolManager.sol
+6 −6		src/types/Currency.sol
+8 −3		test/DynamicFees.t.sol
+5 −1		test/PoolManager.t.sol
+4 −4		test/PoolManagerInitialize.t.sol
+6 −2		test/libraries/Hooks.t.sol
+15 −3		test/types/Currency.t.sol