temporary position descriptor constructor arg

Uniswap · Oct 11, 2024 · 7d0343f · 7d0343f
1 parent 650f31c
commit 7d0343f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/test/integration-tests/shared/constants.ts b/test/integration-tests/shared/constants.ts
@@ -25,3 +25,4 @@ export const V3_FACTORY_MAINNET = '0x1F98431c8aD98523631AE4a59f267346ea31F984'
 export const V3_INIT_CODE_HASH_MAINNET = '0xe34f199b19b2b4f47f68442619d555527d244f78a3297ea89325f843f87b8b54'
 export const V2_INIT_CODE_HASH_MAINNET = '0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f'
 export const V3_NFT_POSITION_MANAGER_MAINNET = '0xC36442b4a4522E871399CD717aBDD847Ab11FE88'
+export const V4_POSITION_DESCRIPTOR_ADDRESS = '0x0000000000000000000000000000000000000000' // TODO, deploy this in-line and use the proper address in posm's constructor
diff --git a/test/integration-tests/shared/deployUniversalRouter.ts b/test/integration-tests/shared/deployUniversalRouter.ts
@@ -8,6 +8,7 @@ import {
   V3_INIT_CODE_HASH_MAINNET,
   PERMIT2_ADDRESS,
   V3_NFT_POSITION_MANAGER_MAINNET,
+  V4_POSITION_DESCRIPTOR_ADDRESS,
 } from './constants'
 import { deployV4PoolManager, deployV4PositionManager } from './v4Helpers'
 
@@ -22,7 +23,7 @@ export async function deployRouter(v4PoolManager?: string, mockReentrantWETH?: s
     poolInitCodeHash: V3_INIT_CODE_HASH_MAINNET,
     v4PoolManager: poolManager,
     v3NFTPositionManager: V3_NFT_POSITION_MANAGER_MAINNET,
-    v4PositionManager: (await deployV4PositionManager(poolManager, PERMIT2_ADDRESS)).address,
+    v4PositionManager: (await deployV4PositionManager(poolManager, PERMIT2_ADDRESS, V4_POSITION_DESCRIPTOR_ADDRESS)).address,
   }
 
   const routerFactory = await ethers.getContractFactory('UniversalRouter')

diff --git a/test/integration-tests/shared/v4Helpers.ts b/test/integration-tests/shared/v4Helpers.ts
@@ -58,12 +58,13 @@ export const ETH_USDC = {
   tickUpper: ETH_USDC_TICK_UPPER,
 }
 
-export async function deployV4PositionManager(v4PoolManager: string, permit2: string): Promise<PositionManager> {
+export async function deployV4PositionManager(v4PoolManager: string, permit2: string, v4PositionDescriptor: string): Promise<PositionManager> {
   const positionManagerFactory = await ethers.getContractFactory('PositionManager')
   const positionManager = (await positionManagerFactory.deploy(
     v4PoolManager,
     permit2,
-    50000
+    50000,
+    v4PositionDescriptor
   )) as unknown as PositionManager
   return positionManager
 }