Update v4 core #74

marktoda · 2023-11-17T21:52:17Z

Related Issue

Which issue does this pull request resolve?

Description of changes

This commit updates v4 core to latest and fixes integration issues

marktoda · 2023-11-17T21:52:40Z

test/TWAMM.t.sol

-        assertEq(earningsFactor0For1, 1712020976636017581269515821040000);
-        assertEq(earningsFactor1For0, 1470157410324350030712806974476955);
+        assertEq(earningsFactor0For1, 1636776489931663248324424309240000);
+        assertEq(earningsFactor1For0, 1534530274609724617872321172427618);


This is sus - I'm not sure what could have changed to cause these values to be different..

that is odd....

hensha256

left some thoughts

.env

test/FullRange.t.sol

hensha256 · 2023-11-20T16:29:04Z

test/FullRange.t.sol

@@ -102,17 +101,14 @@ contract TestFullRange is Test, Deployers, GasSnapshot {
        keyWithLiq = createPoolKey(token0, token2);


where is createPoolKey from? we dont have that function in core 🤔

it's defined in this file, it was here when i got here

hensha256 · 2023-11-20T16:31:06Z

test/FullRange.t.sol


-        manager.initialize(keyWithLiq, SQRT_RATIO_1_1, ZERO_BYTES);
+        initPool(keyWithLiq.currency0, keyWithLiq.currency1, fullRange, 3000, SQRT_RATIO_1_1, ZERO_BYTES);


this fullRange hook address doesnt seem to be in the keyWithLiq key before?

yeah it is... in createPoolKey

test/TWAMM.t.sol

snreynolds · 2023-11-27T20:09:22Z

contracts/hooks/examples/LimitOrder.sol

@@ -204,8 +204,12 @@ contract LimitOrder is BaseHook {
            ZERO_BYTES
        );

-        if (delta.amount0() < 0) poolManager.mint(key.currency0, address(this), amount0 = uint128(-delta.amount0()));
-        if (delta.amount1() < 0) poolManager.mint(key.currency1, address(this), amount1 = uint128(-delta.amount1()));
+        if (delta.amount0() < 0) {


Not that a change is needed, bc we'd probably need other checks in place to support this but I think this code no longer works on custom accounting/access-lock-enabled hooks

snreynolds · 2023-11-27T20:16:03Z

test/utils/HookEnabledSwapRouter.sol

@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.20;
+


Why do we need this? You can pass in hook data with PoolSwapTest

snreynolds · 2023-11-27T20:17:31Z

test/TWAMM.t.sol

-        assertEq(earningsFactor0For1, 1712020976636017581269515821040000);
-        assertEq(earningsFactor1For0, 1470157410324350030712806974476955);
+        assertEq(earningsFactor0For1, 1636776489931663248324424309240000);
+        assertEq(earningsFactor1For0, 1534530274609724617872321172427618);


snreynolds · 2023-11-27T20:18:16Z

test/TWAMM.t.sol

-        assertEq(earningsFactor0For1, 1712020976636017581269515821040000);
-        assertEq(earningsFactor1For0, 1470157410324350030712806974476955);
+        assertEq(earningsFactor0For1, 1636776489931663248324424309240000);
+        assertEq(earningsFactor1For0, 1534530274609724617872321172427618);


that is odd....

saucepoint · 2023-12-01T15:30:26Z

any chance we can include a change like this #26 for this PR?

Seeing some devs run into problems regarding this

marktoda · 2023-12-11T20:12:58Z

any chance we can include a change like this #26 for this PR?

ah good idea, can be a separate pr tho

snreynolds · 2023-12-11T20:28:27Z

Not sure why linting is failing ❓

contracts/hooks/examples/FullRange.sol

ConjunctiveNormalForm · 2023-12-15T17:14:19Z

contracts/libraries/PoolGetters.sol

@@ -62,7 +63,7 @@ library PoolGetters {
                // all the 1s at or to the right of the current bitPos
                uint256 mask = (1 << bitPos) - 1 + (1 << bitPos);
                // uint256 masked = self[wordPos] & mask;
-                uint256 masked = getTickBitmapAtWord(poolManager, poolId, wordPos) & mask;


can probably remove getTickBitmapAtWord btw

marktoda

cant approve my own PR :D think fine to merge - we def have some cleanup to do here but can be incremental

* Update to v4-core latest (Uniswap#64) * first pass on using new router function singatures * updated v4-core * updated .getSlot0, as it returns less data now * snapshots * add base contracts and interfaces (Uniswap#75) * Update v4 core (Uniswap#74) * feat: update v4-core This commit updates v4 core to latest and fixes integration issues * fix: tests * fix: update tests * fix: test router was borked * fix: alice comments * update to latest core * use prev values * change twamm to use pool getters * changes after merging main * use --via-ir in cli * fix formatting * fix FullRange/TWAMM hook --------- Co-authored-by: Sara Reynolds <[email protected]> * feat: Revert style quoter (Uniswap#73) * add PoolTicksCounter library * quoter exact input single * quoter test * return deltas instead * safe casting to correct types * QuoteExactInput skeleton * multiple entries * break handleRevert by type * quoteExactInput and unit tests * more QuoteExactInput tests * remove lgos * remove commented out struct * via-ir in ci * remove unused imports/functions * store iteration params locally instead of editing function input * pull out sqrtPriceLimit to its own function * PathKey to its own library * rename initializedTicksCrossed to initializedTicksLoaded * remove manual abi encoding in yul :p * fix linter warnings for Quoter * natspec for IQuoter * feat: update v4-core This commit updates v4 core to latest and fixes integration issues * fix: tests * style fixes * inheritdoc * ExactInSingleBatch * fix: update tests * fix: test router was borked * exact out * fix: alice comments * fix ExactOutput * add ExactOput unit tests * add quoteExactOutputBatch * remove solhint config * remove newline * add QuoteExactOutput in interface * refactor lockAcquired * move magic numbers to constants + doc * add more natspec * natspec * named imports * self-call branching * remove old code * remove console2 import * refactor PathKeyLib * amountOutCached * inherit ILockCallback * add base contracts and interfaces (Uniswap#75) * remove unused errors * test lockAcquired reverts * remove ...Batch interface * REASON -> RESPONSE when valid * complete natspec * remove SwapInfo imports * rename to SwapParameters * move quoter structs into IQuoter interface * update to latest core * use prev values * change twamm to use pool getters * changes after merging main * use --via-ir in cli * fix formatting * fix FullRange/TWAMM hook * update ticks counter * update Quoter test * typo * typo * simplify handleRevertSingle * merge QuoteInput/OutputSingle structs * combine IQuoter structs * using ... ordering * update snapshots * move amountOutCached into inner call * using PathKeyLib for PathKey * fix amountOutCached * remove console2 import * resurface revert reason * clean up validateRevert * update natsppec * remove unused --------- Co-authored-by: Mark Toda <[email protected]> Co-authored-by: Tina <[email protected]> Co-authored-by: Sara Reynolds <[email protected]> * (Quoter) Avoid IR (Uniswap#93) * avoid stack too deep * pack local variables into structs; remove need for IR * reorg struct * snapshots * forge fmt * restore settings * remove IR * ensure tokens are ordered properly by using salts * gas snapshot * remove console logs * chore: update v4-core:latest (Uniswap#89) * update v4-core * update to new liquidity hooks * forge fmt; reuse v4-core justfile * snapshots * rename getHooksCalls --> getHookPermissions * enforce permanent liquidity with beforeRemoveLiquidity * snapshot * update v4-core (again) * snapshots with new v4-core * v4-core:latest * pin 0.8.24 * merge in remote; regenerate snapshots * remove justfile * repin cancun * pin token addresses using vm.etch * snapshots * forge fmt * remove via-ir and custom solc from CI * test nit * Update v4-core submodule to use https (Uniswap#97) Co-authored-by: saucepoint <[email protected]> * chore: add semgrep (Uniswap#94) --------- Co-authored-by: saucepoint <[email protected]> Co-authored-by: Tina <[email protected]> Co-authored-by: marktoda <[email protected]> Co-authored-by: Sara Reynolds <[email protected]> Co-authored-by: Zach Yang <[email protected]> Co-authored-by: 0x57 <[email protected]> Co-authored-by: mr-uniswap <[email protected]>

marktoda added 3 commits November 16, 2023 16:07

feat: update v4-core

d526f75

This commit updates v4 core to latest and fixes integration issues

fix: tests

3e3ab5d

fix: update tests

4fe142c

marktoda commented Nov 17, 2023

View reviewed changes

marktoda marked this pull request as ready for review November 17, 2023 22:06

marktoda force-pushed the update-v4-core branch from 200c010 to be6aa94 Compare November 17, 2023 22:09

fix: test router was borked

15a9c8a

marktoda force-pushed the update-v4-core branch from be6aa94 to 15a9c8a Compare November 17, 2023 22:11

hensha256 reviewed Nov 20, 2023

View reviewed changes

fix: alice comments

0dc0c0b

marktoda requested a review from hensha256 November 21, 2023 16:16

snreynolds reviewed Nov 27, 2023

View reviewed changes

snreynolds added 5 commits December 11, 2023 13:58

update to latest core

311ff6f

use prev values

5f4b717

change twamm to use pool getters

ffe3b05

Merge branch 'main' into update-v4-core

d559965

changes after merging main

6a72276

use --via-ir in cli

57183bd

hensha256 mentioned this pull request Dec 13, 2023

[Bug]: Modify Hooks.Calls into Hooks.Permissions #87

Closed

hensha256 linked an issue Dec 13, 2023 that may be closed by this pull request

[Bug]: Modify Hooks.Calls into Hooks.Permissions #87

Closed

hensha256 requested changes Dec 13, 2023

View reviewed changes

contracts/hooks/examples/FullRange.sol Outdated Show resolved Hide resolved

snreynolds added 2 commits December 14, 2023 12:30

fix formatting

18d68e8

fix FullRange/TWAMM hook

fead64a

ConjunctiveNormalForm approved these changes Dec 14, 2023

View reviewed changes

ConjunctiveNormalForm reviewed Dec 15, 2023

View reviewed changes

marktoda commented Dec 15, 2023

View reviewed changes

hensha256 approved these changes Dec 19, 2023

View reviewed changes

snreynolds merged commit 0b46125 into main Dec 19, 2023
2 checks passed

snreynolds deleted the update-v4-core branch December 19, 2023 15:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update v4 core #74

Update v4 core #74

marktoda commented Nov 17, 2023

marktoda Nov 17, 2023

snreynolds Nov 27, 2023

snreynolds Nov 27, 2023

hensha256 left a comment

hensha256 Nov 20, 2023

marktoda Nov 20, 2023

hensha256 Nov 20, 2023

marktoda Nov 20, 2023

snreynolds Nov 27, 2023 •

edited

Loading

snreynolds Nov 27, 2023

snreynolds Nov 27, 2023

snreynolds Nov 27, 2023

saucepoint commented Dec 1, 2023

marktoda commented Dec 11, 2023 •

edited

Loading

snreynolds commented Dec 11, 2023

ConjunctiveNormalForm Dec 15, 2023

marktoda left a comment

		@@ -102,17 +101,14 @@ contract TestFullRange is Test, Deployers, GasSnapshot {
		keyWithLiq = createPoolKey(token0, token2);


		manager.initialize(keyWithLiq, SQRT_RATIO_1_1, ZERO_BYTES);
		initPool(keyWithLiq.currency0, keyWithLiq.currency1, fullRange, 3000, SQRT_RATIO_1_1, ZERO_BYTES);

		@@ -0,0 +1,70 @@
		// SPDX-License-Identifier: UNLICENSED
		pragma solidity ^0.8.20;

Update v4 core #74

Update v4 core #74

Conversation

marktoda commented Nov 17, 2023

Related Issue

Description of changes

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hensha256 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

snreynolds Nov 27, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

saucepoint commented Dec 1, 2023

marktoda commented Dec 11, 2023 • edited Loading

snreynolds commented Dec 11, 2023

Choose a reason for hiding this comment

marktoda left a comment

Choose a reason for hiding this comment

snreynolds Nov 27, 2023 •

edited

Loading

marktoda commented Dec 11, 2023 •

edited

Loading