update periphery

Uniswap · Sep 5, 2024 · 30ac717 · 30ac717
1 parent 912b9b0
commit 30ac717
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/contracts/modules/Payments.sol b/contracts/modules/Payments.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.24;
 
 import {Constants} from '../libraries/Constants.sol';
 import {ActionConstants} from '@uniswap/v4-periphery/src/libraries/ActionConstants.sol';
-import {BipsLibrary} from '@uniswap/v4-periphery/src/libraries/BipsLibrary.sol';
+import {BipsLibrary} from '@uniswap/v4-core/src/libraries/BipsLibrary.sol';
 import {PaymentsImmutables} from '../modules/PaymentsImmutables.sol';
 import {SafeTransferLib} from 'solmate/src/utils/SafeTransferLib.sol';
 import {ERC20} from 'solmate/src/tokens/ERC20.sol';

diff --git a/lib/v4-periphery b/lib/v4-periphery
diff --git a/test/integration-tests/gas-tests/__snapshots__/UniversalRouter.gas.test.ts.snap b/test/integration-tests/gas-tests/__snapshots__/UniversalRouter.gas.test.ts.snap
@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`UniversalRouter Gas Tests gas: bytecode size 1`] = `18676`;
+exports[`UniversalRouter Gas Tests gas: bytecode size 1`] = `18828`;
diff --git a/test/integration-tests/gas-tests/__snapshots__/V3ToV4Migration.gas.test.ts.snap b/test/integration-tests/gas-tests/__snapshots__/V3ToV4Migration.gas.test.ts.snap
@@ -31,34 +31,34 @@ Object {
 exports[`V3 to V4 Migration Gas Tests V4 Commands increase gas: increase 1`] = `
 Object {
   "calldataByteLength": 2308,
-  "gasUsed": 223325,
+  "gasUsed": 222909,
 }
 `;
 
 exports[`V3 to V4 Migration Gas Tests V4 Commands increase gas: migrate and increase 1`] = `
 Object {
   "calldataByteLength": 3204,
-  "gasUsed": 449128,
+  "gasUsed": 448795,
 }
 `;
 
 exports[`V3 to V4 Migration Gas Tests V4 Commands mint gas: migrate and mint 1`] = `
 Object {
   "calldataByteLength": 2500,
-  "gasUsed": 555229,
+  "gasUsed": 554776,
 }
 `;
 
 exports[`V3 to V4 Migration Gas Tests V4 Commands mint gas: migrate weth position into eth position with forwarding 1`] = `
 Object {
   "calldataByteLength": 2788,
-  "gasUsed": 575500,
+  "gasUsed": 575070,
 }
 `;
 
 exports[`V3 to V4 Migration Gas Tests V4 Commands mint gas: mint 1`] = `
 Object {
   "calldataByteLength": 1604,
-  "gasUsed": 392964,
+  "gasUsed": 392397,
 }
 `;
diff --git a/test/integration-tests/shared/v4Helpers.ts b/test/integration-tests/shared/v4Helpers.ts
@@ -60,13 +60,17 @@ export const ETH_USDC = {
 
 export async function deployV4PositionManager(v4PoolManager: string, permit2: string): Promise<PositionManager> {
   const positionManagerFactory = await ethers.getContractFactory('PositionManager')
-  const positionManager = (await positionManagerFactory.deploy(v4PoolManager, permit2)) as unknown as PositionManager
+  const positionManager = (await positionManagerFactory.deploy(
+    v4PoolManager,
+    permit2,
+    50000
+  )) as unknown as PositionManager
   return positionManager
 }
 
 export async function deployV4PoolManager(): Promise<PoolManager> {
   const poolManagerFactory = await ethers.getContractFactory('PoolManager')
-  const poolManager = (await poolManagerFactory.deploy(500000)) as unknown as PoolManager
+  const poolManager = (await poolManagerFactory.deploy()) as unknown as PoolManager
   return poolManager
 }