wip

Uniswap · Jun 25, 2024 · dd25730 · dd25730
1 parent 7e49d96
commit dd25730
Show file tree

Hide file tree

Showing 21 changed files with 37 additions and 22 deletions.
diff --git a/.forge-snapshots/FullRangeAddInitialLiquidity.snap b/.forge-snapshots/FullRangeAddInitialLiquidity.snap
@@ -1 +1 @@
-311181
+354477
diff --git a/.forge-snapshots/FullRangeAddLiquidity.snap b/.forge-snapshots/FullRangeAddLiquidity.snap
@@ -1 +1 @@
-122990
+161786
diff --git a/.forge-snapshots/FullRangeFirstSwap.snap b/.forge-snapshots/FullRangeFirstSwap.snap
@@ -1 +1 @@
-80220
+146400
diff --git a/.forge-snapshots/FullRangeInitialize.snap b/.forge-snapshots/FullRangeInitialize.snap
@@ -1 +1 @@
-1016976
+1039616
diff --git a/.forge-snapshots/FullRangeRemoveLiquidity.snap b/.forge-snapshots/FullRangeRemoveLiquidity.snap
@@ -1 +1 @@
-110566
+146394
diff --git a/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap b/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap
@@ -1 +1 @@
-240044
+281672
diff --git a/.forge-snapshots/FullRangeSecondSwap.snap b/.forge-snapshots/FullRangeSecondSwap.snap
@@ -1 +1 @@
-45930
+116110
diff --git a/.forge-snapshots/FullRangeSwap.snap b/.forge-snapshots/FullRangeSwap.snap
@@ -1 +1 @@
-79351
+145819
diff --git a/.forge-snapshots/OracleGrow10Slots.snap b/.forge-snapshots/OracleGrow10Slots.snap
@@ -1 +1 @@
-232960
+254164
diff --git a/.forge-snapshots/OracleGrow10SlotsCardinalityGreater.snap b/.forge-snapshots/OracleGrow10SlotsCardinalityGreater.snap
@@ -1 +1 @@
-223649
+249653
diff --git a/.forge-snapshots/OracleGrow1Slot.snap b/.forge-snapshots/OracleGrow1Slot.snap
@@ -1 +1 @@
-32845
+54049
diff --git a/.forge-snapshots/OracleGrow1SlotCardinalityGreater.snap b/.forge-snapshots/OracleGrow1SlotCardinalityGreater.snap
@@ -1 +1 @@
-23545
+49549
diff --git a/.forge-snapshots/OracleInitialize.snap b/.forge-snapshots/OracleInitialize.snap
@@ -1 +1 @@
-51310
+72794
diff --git a/.forge-snapshots/TWAMMSubmitOrder.snap b/.forge-snapshots/TWAMMSubmitOrder.snap
@@ -1 +1 @@
-122336
+156828
diff --git a/.forge-snapshots/decreaseLiquidity_erc20.snap b/.forge-snapshots/decreaseLiquidity_erc20.snap
@@ -1 +1 @@
-119430
+190044
diff --git a/.forge-snapshots/decreaseLiquidity_erc6909.snap b/.forge-snapshots/decreaseLiquidity_erc6909.snap
@@ -1 +1 @@
-117181
+168894
diff --git a/.forge-snapshots/increaseLiquidity_erc20.snap b/.forge-snapshots/increaseLiquidity_erc20.snap
@@ -1 +1 @@
-60600
+173212
diff --git a/.forge-snapshots/increaseLiquidity_erc6909.snap b/.forge-snapshots/increaseLiquidity_erc6909.snap
@@ -1 +1 @@
-64370
+148794
diff --git a/.forge-snapshots/mintWithLiquidity.snap b/.forge-snapshots/mintWithLiquidity.snap
@@ -1 +1 @@
-444617
+468501
diff --git a/contracts/base/BaseLiquidityManagement.sol b/contracts/base/BaseLiquidityManagement.sol
@@ -126,6 +126,12 @@ contract BaseLiquidityManagement is IBaseLiquidityManagement, SafeCallback {
             position.liquidity
         );
 
+        console2.log(callerFeesAccrued.amount0());
+        console2.log(callerFeesAccrued.amount1());
+        console2.log("totalFees");
+        console2.log(totalFeesAccrued.amount0());
+        console2.log(totalFeesAccrued.amount1());
+
         // Calculate the accurate tokens owed to the caller.
         // If the totalFeesAccrued equals the callerFeesAccrued then the total owed to the caller is just the liquidityDelta.
         // If the totalFeesAccrued is greater than the callerFeesAccrued, we must account for the difference.

diff --git a/test/position-managers/IncreaseLiquidity.t.sol b/test/position-managers/IncreaseLiquidity.t.sol
@@ -391,7 +391,7 @@ contract IncreaseLiquidityTest is Test, Deployers, GasSnapshot, Fuzzers {
         (uint256 tokenIdBob,) = lpm.mint(range, liquidityBob, block.timestamp + 1, bob, ZERO_BYTES);
 
         // donate to create fees
-        donateRouter.donate(key, 0.2e18, 0.2e18, ZERO_BYTES);
+        donateRouter.donate(key, 20e18, 20e18, ZERO_BYTES);
 
         (uint256 token0Owed, uint256 token1Owed) = lpm.feesOwed(tokenIdAlice);
 
@@ -400,7 +400,7 @@ contract IncreaseLiquidityTest is Test, Deployers, GasSnapshot, Fuzzers {
         lpm.collect(tokenIdBob, bob, ZERO_BYTES, false);
 
         // donate to create more fees
-        donateRouter.donate(key, 0.2e18, 0.2e18, ZERO_BYTES);
+        donateRouter.donate(key, 20e18, 20e18, ZERO_BYTES);
 
         (uint256 newToken0Owed, uint256 newToken1Owed) = lpm.feesOwed(tokenIdAlice);
         // alice's fees should be doubled
@@ -425,12 +425,21 @@ contract IncreaseLiquidityTest is Test, Deployers, GasSnapshot, Fuzzers {
             lpm.increaseLiquidity(tokenIdAlice, liquidityDelta, ZERO_BYTES, false);
         }
 
-        // alice did not spend any tokens, approximately
+        // alice did not spend any tokens
         assertEq(balance0AliceBefore, currency0.balanceOf(alice), "alice spent token0");
         assertEq(balance1AliceBefore, currency1.balanceOf(alice), "alice spent token1");
+
+        // passes: but WRONG!!!
+        // assertEq(balance0AliceBefore - currency0.balanceOf(alice), 10e18);
+        // assertEq(balance1AliceBefore - currency1.balanceOf(alice), 10e18);
 
         (token0Owed, token1Owed) = lpm.feesOwed(tokenIdAlice);
         assertEq(token0Owed, 0);
         assertEq(token1Owed, 0);
+
+        // bob still collects 5
+        (token0Owed, token1Owed) = lpm.feesOwed(tokenIdBob);
+        assertApproxEqAbs(token0Owed, 5e18, 1 wei);
+        assertApproxEqAbs(token1Owed, 5e18, 1 wei);
     }
 }