Revert "Feat/eth support 2 (#133)" (#159)

This reverts commit 343668f.
whetstoneresearch · Oct 23, 2024 · d12bc45 · d12bc45
1 parent 343668f
commit d12bc45
Show file tree

Hide file tree

Showing 12 changed files with 469 additions and 582 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -56,3 +56,4 @@ jobs:
           export PROTOCOL_FEE=50
           forge test -vvv --via-ir
         id: test2
+
diff --git a/src/Doppler.sol b/src/Doppler.sol
@@ -78,8 +78,6 @@ contract Doppler is BaseHook {
     bool immutable isToken0; // whether token0 is the token being sold (true) or token1 (false)
     uint256 immutable numPDSlugs; // number of price discovery slugs
 
-    receive() external payable {}
-
     constructor(
         IPoolManager _poolManager,
         PoolKey memory _poolKey,
@@ -728,8 +726,8 @@ contract Doppler is BaseHook {
                 (BalanceDelta positionDeltas, BalanceDelta feesAccrued) = poolManager.modifyLiquidity(
                     key,
                     IPoolManager.ModifyLiquidityParams({
-                        tickLower: isToken0 ? lastEpochPositions[i].tickLower : lastEpochPositions[i].tickUpper,
-                        tickUpper: isToken0 ? lastEpochPositions[i].tickUpper : lastEpochPositions[i].tickLower,
+                        tickLower: lastEpochPositions[i].tickLower,
+                        tickUpper: lastEpochPositions[i].tickUpper,
                         liquidityDelta: -int128(lastEpochPositions[i].liquidity),
                         salt: bytes32(uint256(lastEpochPositions[i].salt))
                     }),
@@ -765,8 +763,12 @@ contract Doppler is BaseHook {
                 poolManager.modifyLiquidity(
                     key,
                     IPoolManager.ModifyLiquidityParams({
-                        tickLower: isToken0 ? newPositions[i].tickLower : newPositions[i].tickUpper,
-                        tickUpper: isToken0 ? newPositions[i].tickUpper : newPositions[i].tickLower,
+                        tickLower: newPositions[i].tickLower < newPositions[i].tickUpper
+                            ? newPositions[i].tickLower
+                            : newPositions[i].tickUpper,
+                        tickUpper: newPositions[i].tickUpper > newPositions[i].tickLower
+                            ? newPositions[i].tickUpper
+                            : newPositions[i].tickLower,
                         liquidityDelta: int128(newPositions[i].liquidity),
                         salt: bytes32(uint256(newPositions[i].salt))
                     }),
@@ -822,8 +824,8 @@ contract Doppler is BaseHook {
             (BalanceDelta callerDelta,) = poolManager.modifyLiquidity(
                 key,
                 IPoolManager.ModifyLiquidityParams({
-                    tickLower: isToken0 ? upperSlug.tickLower : upperSlug.tickUpper,
-                    tickUpper: isToken0 ? upperSlug.tickUpper : upperSlug.tickLower,
+                    tickLower: upperSlug.tickLower,
+                    tickUpper: upperSlug.tickUpper,
                     liquidityDelta: int128(upperSlug.liquidity),
                     salt: UPPER_SLUG_SALT
                 }),
@@ -837,8 +839,8 @@ contract Doppler is BaseHook {
                 (BalanceDelta callerDelta,) = poolManager.modifyLiquidity(
                     key,
                     IPoolManager.ModifyLiquidityParams({
-                        tickLower: isToken0 ? priceDiscoverySlugs[i].tickLower : priceDiscoverySlugs[i].tickUpper,
-                        tickUpper: isToken0 ? priceDiscoverySlugs[i].tickUpper : priceDiscoverySlugs[i].tickLower,
+                        tickLower: priceDiscoverySlugs[i].tickLower,
+                        tickUpper: priceDiscoverySlugs[i].tickUpper,
                         liquidityDelta: int128(priceDiscoverySlugs[i].liquidity),
                         salt: bytes32(uint256(3 + i))
                     }),
Original file line number	Diff line number	Diff line change
Expand Up		@@ -56,3 +56,4 @@ jobs:
		export PROTOCOL_FEE=50
		forge test -vvv --via-ir
		id: test2