Solve ToB-UNI4-3 without restricting sync #886
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wjmelements
commented
Sep 28, 2024
|
I quite like this as a solution, nice. |
|
wjmelements
commented
Oct 1, 2024
snreynolds
reviewed
Oct 8, 2024
snreynolds
reviewed
Oct 8, 2024
There was a problem hiding this comment.
I think we should remove L56 in ProtocolFees.sol but I'm in favor of this generally. I looked at the reasoning in #883 and I see how it provides more flexibility to integrators
|
@wjmelements Can you please update this branch? |
snreynolds
reviewed
Oct 22, 2024
snreynolds
reviewed
Oct 22, 2024
snreynolds
reviewed
Oct 22, 2024
Co-authored-by: Sara Reynolds <30504811+snreynolds@users.noreply.github.com>
I have pushed a revert test, e710ad1, for the locked case that works with |
wjmelements
commented
Oct 23, 2024
|
Can you add back in this modifier and include it on your test. I think thats how we solved this problem in the past https://github.com/Uniswap/v4-core/pull/856/files#r1739134580 |
|
|
wjmelements
commented
Oct 24, 2024
| @@ -1,3 +1,3 @@ | |||
| { | |||
| "getReserves": "3931" | |||
| "getReserves": "3973" | |||
There was a problem hiding this comment.
Surprisingly this increase seems to be caused by noIsolate in test_sync_multiple_unlocked, even though this snapshot is from test_settle_nonNative_withoutSync_loseFunds. When I revert 82dda85 it goes back to 3931. I'm unsure why.
There was a problem hiding this comment.
This change also results in 3931:
function test_sync_multiple_unlocked() public /*noIsolate*/ {
manager.sync(currency1);
//assertEq(Currency.unwrap(currency1), Currency.unwrap(manager.getSyncedCurrency()));
manager.sync(currency0);
//assertEq(Currency.unwrap(currency0), Currency.unwrap(manager.getSyncedCurrency()));
}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Solves #883 and
ToB-UNI4-3Reviewers @hensha256 @snreynolds
As described in #885 there are advantages to allowing sync to be called outside of the unlock callback.
The main reason this ability was removed was to fool-proof
collectProtocolFeesso that it cannot be called betweensyncandsettle.This PR presents an alternative to #885 that still solves ToB-UNI4-3, not by modifying
sync, but by modifyingcollectProtocolFees.Assuming
syncis called more often thancollectProtocolFees, this fix forToB-UNI4-3is superior to #856 even without considering situations like ERC-4337.Changes
Restore
syncusability outside of the unlock callback.Check in
collectProtocolFeeswhether the token to be transferred out is currently the synced token, handling the native Currency case.