Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Oct 23, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/test.yml
View file
Open in desktop
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

22 changes: 12 additions & 10 deletions src/Doppler.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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))
}),
Expand Down Expand Up @@ -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))
}),
Expand Down Expand Up @@ -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
}),
Expand All @@ -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))
}),
Expand Down
Loading
Loading