edits

Uniswap · Feb 7, 2025 · 567c20b · 567c20b
1 parent 4acdd70
commit 567c20b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/sdks/universal-router-sdk/src/swapRouter.ts b/sdks/universal-router-sdk/src/swapRouter.ts
@@ -10,10 +10,10 @@ import {
   RemoveLiquidityOptions as V3RemoveLiquidityOptions,
 } from '@uniswap/v3-sdk'
 import {
-  MintOptions,
   Position as V4Position,
   V4PositionManager,
   AddLiquidityOptions as V4AddLiquidityOptions,
+  MintOptions,
   Pool as V4Pool,
   PoolKey,
 } from '@uniswap/v4-sdk'
@@ -36,9 +36,9 @@ export interface MigrateV3ToV4Options {
   v4AddLiquidityOptions: V4AddLiquidityOptions
 }
 
-function isMint(options: V4AddLiquidityOptions): options is MintOptions {
-  return 'recipient' in options
-}
+// function isMint(options: V4AddLiquidityOptions): options is MintOptions {
+//   return 'recipient' in options
+// }
 
 function isMigrate(options: V4AddLiquidityOptions): options is MintOptions {
   return 'migrateOptions' in options && options.migrateOptions?.migrate === true
@@ -119,7 +119,7 @@ export abstract class SwapRouter {
       'RECIPIENT_NOT_POSITION_MANAGER'
     )
     // Migration must be a mint operation, not an increase because the UR should not have permission to increase liquidity on a v4 position
-    invariant(isMint(options.v4AddLiquidityOptions), 'MINT_REQUIRED')
+    //invariant(isMint(options.v4AddLiquidityOptions), 'MINT_REQUIRED')
     invariant(isMigrate(options.v4AddLiquidityOptions), 'MIGRATE_REQUIRED')
 
     const planner = new RoutePlanner()

diff --git a/sdks/universal-router-sdk/test/forge/MigratorCallParameters.t.sol b/sdks/universal-router-sdk/test/forge/MigratorCallParameters.t.sol
@@ -185,7 +185,8 @@ contract MigratorCallParametersTest is Test, Interop, DeployRouter {
 
         // add the position to v3 so we have something to migrate
         assertEq(INonfungiblePositionManager(V3_POSITION_MANAGER).balanceOf(from), 0);
-        // USDC < WETH
+        // USDC < WETH (USDC is token0, WETH is token1)
+        // in range v3 position, tickLower = 200040, tickUpper = 300000, tickCurrent = 205265
         mintV3Position(address(USDC), address(WETH), 3000, 2500e6, 1e18, 200040, 300000);
         assertEq(INonfungiblePositionManager(V3_POSITION_MANAGER).balanceOf(from), 1);
 
@@ -232,7 +233,8 @@ contract MigratorCallParametersTest is Test, Interop, DeployRouter {
 
         // add the position to v3 so we have something to migrate
         assertEq(INonfungiblePositionManager(V3_POSITION_MANAGER).balanceOf(from), 0);
-        // USDC < WETH
+        // USDC < WETH (USDC is token0, WETH is token1)
+        // in range v3 position, tickLower = 200040, tickUpper = 300000, tickCurrent = 205265
         mintV3Position(address(USDC), address(WETH), 3000, 2500e6, 1e18, 200040, 300000);
         assertEq(INonfungiblePositionManager(V3_POSITION_MANAGER).balanceOf(from), 1);
 
@@ -279,7 +281,8 @@ contract MigratorCallParametersTest is Test, Interop, DeployRouter {
 
         // add the position to v3 so we have something to migrate
         assertEq(INonfungiblePositionManager(V3_POSITION_MANAGER).balanceOf(from), 0);
-        // USDC < WETH
+        // USDC < WETH (USDC is token0, WETH is token1)
+        // in range v3 position, tickLower = 200040, tickUpper = 300000, tickCurrent = 205265
         mintV3Position(address(USDC), address(WETH), 3000, 2500e6, 1e18, 200040, 300000);
         assertEq(INonfungiblePositionManager(V3_POSITION_MANAGER).balanceOf(from), 1);