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

adhere to CEI when unsubscribing on burn #333

Merged
merged 3 commits into from
Sep 4, 2024
Merged

adhere to CEI when unsubscribing on burn #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79f5bdb
adhere to CEI when unsubscribing on burn
saucepoint Sep 3, 2024
21d9e9f
merge in main; regenerate gas
saucepoint Sep 3, 2024
9503cce
merge in main; regenerate gas
saucepoint Sep 4, 2024
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
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_burn_empty.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
47320
47276
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_burn_empty_native.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
47137
47094
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_burn_nonEmpty_native_withClose.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
123966
123923
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_burn_nonEmpty_native_withTakePair.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
123464
123420
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_burn_nonEmpty_withClose.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
131044
131001
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_burn_nonEmpty_withTakePair.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
130542
130499
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_decrease_burnEmpty.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
135120
135076
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_decrease_burnEmpty_native.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
127859
127816
4 changes: 3 additions & 1 deletion src/PositionManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,11 +335,13 @@ contract PositionManager is
(liquidityDelta - feesAccrued).validateMinOut(amount0Min, amount1Min);
}

if (positionConfigs[tokenId].hasSubscriber()) _unsubscribe(tokenId, config);
bool hasSubscriber = positionConfigs[tokenId].hasSubscriber();

delete positionConfigs[tokenId];
// Burn the token.
_burn(tokenId);

if (hasSubscriber) _unsubscribe(tokenId, config);
}

function _settlePair(Currency currency0, Currency currency1) internal {
Expand Down
Loading