Update core in periphery (#156)

Co-authored-by: Sara Reynolds <[email protected]>
Uniswap · Jul 17, 2024 · 087a262 · 087a262
1 parent a54a92e
commit 087a262
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 20 deletions.
diff --git a/.forge-snapshots/FullRangeAddInitialLiquidity.snap b/.forge-snapshots/FullRangeAddInitialLiquidity.snap
@@ -1 +1 @@
-311181
+309858
diff --git a/.forge-snapshots/FullRangeAddLiquidity.snap b/.forge-snapshots/FullRangeAddLiquidity.snap
@@ -1 +1 @@
-122990
+121640
diff --git a/.forge-snapshots/FullRangeFirstSwap.snap b/.forge-snapshots/FullRangeFirstSwap.snap
@@ -1 +1 @@
-80220
+78977
diff --git a/.forge-snapshots/FullRangeInitialize.snap b/.forge-snapshots/FullRangeInitialize.snap
@@ -1 +1 @@
-1015181
+1008717
diff --git a/.forge-snapshots/FullRangeRemoveLiquidity.snap b/.forge-snapshots/FullRangeRemoveLiquidity.snap
@@ -1 +1 @@
-110566
+109724
diff --git a/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap b/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap
@@ -1 +1 @@
-240044
+239812
diff --git a/.forge-snapshots/FullRangeSecondSwap.snap b/.forge-snapshots/FullRangeSecondSwap.snap
@@ -1 +1 @@
-45930
+44555
diff --git a/.forge-snapshots/FullRangeSwap.snap b/.forge-snapshots/FullRangeSwap.snap
@@ -1 +1 @@
-79351
+78130
diff --git a/.forge-snapshots/TWAMMSubmitOrder.snap b/.forge-snapshots/TWAMMSubmitOrder.snap
@@ -1 +1 @@
-122336
+122043
diff --git a/foundry.toml b/foundry.toml
@@ -1,7 +1,7 @@
 [profile.default]
 src = 'contracts'
 out = 'foundry-out'
-solc_version = '0.8.24'
+solc_version = '0.8.26'
 optimizer_runs = 1000000
 ffi = true
 fs_permissions = [{ access = "read-write", path = ".forge-snapshots/"}]

diff --git a/lib/forge-gas-snapshot b/lib/forge-gas-snapshot
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/v4-core b/lib/v4-core
diff --git a/test/FullRange.t.sol b/test/FullRange.t.sol
@@ -29,7 +29,7 @@ contract TestFullRange is Test, Deployers, GasSnapshot {
     using StateLibrary for IPoolManager;
 
     event Initialize(
-        PoolId poolId,
+        PoolId indexed poolId,
         Currency indexed currency0,
         Currency indexed currency1,
         uint24 fee,
@@ -41,7 +41,7 @@ contract TestFullRange is Test, Deployers, GasSnapshot {
     );
     event Swap(
         PoolId indexed id,
-        address sender,
+        address indexed sender,
         int128 amount0,
         int128 amount1,
         uint160 sqrtPriceX96,
@@ -140,7 +140,12 @@ contract TestFullRange is Test, Deployers, GasSnapshot {
     function testFullRange_beforeInitialize_RevertsIfWrongSpacing() public {
         PoolKey memory wrongKey = PoolKey(key.currency0, key.currency1, 0, TICK_SPACING + 1, fullRange);
 
-        vm.expectRevert(FullRange.TickSpacingNotDefault.selector);
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                Hooks.FailedHookCall.selector, abi.encodeWithSelector(FullRange.TickSpacingNotDefault.selector)
+            )
+        );
+
         manager.initialize(wrongKey, SQRT_PRICE_1_1, ZERO_BYTES);
     }
 
@@ -757,7 +762,12 @@ contract TestFullRange is Test, Deployers, GasSnapshot {
     function testFullRange_BeforeModifyPositionFailsWithWrongMsgSender() public {
         manager.initialize(key, SQRT_PRICE_1_1, ZERO_BYTES);
 
-        vm.expectRevert(FullRange.SenderMustBeHook.selector);
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                Hooks.FailedHookCall.selector, abi.encodeWithSelector(FullRange.SenderMustBeHook.selector)
+            )
+        );
+
         modifyLiquidityRouter.modifyLiquidity(
             key,
             IPoolManager.ModifyLiquidityParams({tickLower: MIN_TICK, tickUpper: MAX_TICK, liquidityDelta: 100, salt: 0}),

diff --git a/test/GeomeanOracle.t.sol b/test/GeomeanOracle.t.sol
@@ -69,7 +69,12 @@ contract TestGeomeanOracle is Test, Deployers {
     }
 
     function testBeforeInitializeRevertsIfFee() public {
-        vm.expectRevert(GeomeanOracle.OnlyOneOraclePoolAllowed.selector);
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                Hooks.FailedHookCall.selector, abi.encodeWithSelector(GeomeanOracle.OnlyOneOraclePoolAllowed.selector)
+            )
+        );
+
         manager.initialize(
             PoolKey(Currency.wrap(address(token0)), Currency.wrap(address(token1)), 1, MAX_TICK_SPACING, geomeanOracle),
             SQRT_PRICE_1_1,
@@ -78,7 +83,12 @@ contract TestGeomeanOracle is Test, Deployers {
     }
 
     function testBeforeInitializeRevertsIfNotMaxTickSpacing() public {
-        vm.expectRevert(GeomeanOracle.OnlyOneOraclePoolAllowed.selector);
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                Hooks.FailedHookCall.selector, abi.encodeWithSelector(GeomeanOracle.OnlyOneOraclePoolAllowed.selector)
+            )
+        );
+
         manager.initialize(
             PoolKey(Currency.wrap(address(token0)), Currency.wrap(address(token1)), 0, 60, geomeanOracle),
             SQRT_PRICE_1_1,
@@ -209,7 +219,13 @@ contract TestGeomeanOracle is Test, Deployers {
             ZERO_BYTES
         );
 
-        vm.expectRevert(GeomeanOracle.OraclePoolMustLockLiquidity.selector);
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                Hooks.FailedHookCall.selector,
+                abi.encodeWithSelector(GeomeanOracle.OraclePoolMustLockLiquidity.selector)
+            )
+        );
+
         modifyLiquidityRouter.modifyLiquidity(
             key,
             IPoolManager.ModifyLiquidityParams(
+0 −1		.forge-snapshots/add.snap
+0 −1		.forge-snapshots/addClosure.snap
+1 −1		.forge-snapshots/checkManyAdd.snap
+1 −1		.forge-snapshots/checkSize.snap
+1 −1		.forge-snapshots/internalClosure.snap
+1 −1		.forge-snapshots/manyAdd.snap
+1 −1		.forge-snapshots/manySstore.snap
+1 −0		.forge-snapshots/singleSstore.snap
+1 −0		.forge-snapshots/singleSstoreClosure.snap
+1 −0		.forge-snapshots/singleSstoreLastCall.snap
+1 −1		.forge-snapshots/sizeTarget.snap
+1 −1		.forge-snapshots/sstoreClosure.snap
+1 −1		.github/workflows/test.yml
+21 −0		LICENSE
+1 −1		lib/forge-std
+11 −2		src/GasSnapshot.sol
+4 −0		src/test/SimpleOperations.sol
+5 −2		src/utils/UintString.sol
+31 −23		test/GasSnapshot.t.sol
+1 −0		.gitattributes
+48 −12		.github/workflows/ci.yml
+31 −0		.github/workflows/sync.yml
+0 −3		.gitmodules
+1 −1		README.md
+3 −3		foundry.toml
+0 −1		lib/ds-test
+1 −1		package.json
+635 −0		scripts/vm.py
+5 −3		src/Base.sol
+4 −3		src/Script.sol
+518 −225		src/StdAssertions.sol
+56 −30		src/StdChains.sol
+205 −17		src/StdCheats.sol
+34 −4		src/StdInvariant.sol
+25 −25		src/StdJson.sol
+245 −99		src/StdStorage.sol
+2 −2		src/StdStyle.sol
+179 −0		src/StdToml.sol
+72 −35		src/StdUtils.sol
+7 −6		src/Test.sol
+1,651 −307		src/Vm.sol
+401 −382		src/console.sol
+1 −1,543		src/console2.sol
+234 −0		src/mocks/MockERC20.sol
+231 −0		src/mocks/MockERC721.sol
+13,248 −0		src/safeconsole.sol
+44 −853		test/StdAssertions.t.sol
+126 −60		test/StdChains.t.sol
+253 −46		test/StdCheats.t.sol
+13 −11		test/StdError.t.sol
+49 −0		test/StdJson.t.sol
+27 −12		test/StdMath.t.sol
+230 −42		test/StdStorage.t.sol
+4 −4		test/StdStyle.t.sol
+49 −0		test/StdToml.t.sol
+80 −35		test/StdUtils.t.sol
+15 −0		test/Vm.t.sol
+8 −0		test/fixtures/test.json
+6 −0		test/fixtures/test.toml
+441 −0		test/mocks/MockERC20.t.sol
+721 −0		test/mocks/MockERC721.t.sol