Merge pull request #341 from whetstoneresearch/fix/migrate-event

Fix/migrate event

remappings.txt

@@ -7,7 +7,8 @@ permit2/=lib/v4-periphery/lib/permit2/
 
 @solmate/=lib/v4-core/lib/solmate/src
 @solady/=lib/solady/src/
-@openzeppelin/=lib/v4-core/lib/openzeppelin-contracts/contracts/
+src:@openzeppelin/=lib/v4-core/lib/openzeppelin-contracts/contracts/
+test:@openzeppelin/=lib/v4-core/lib/openzeppelin-contracts/contracts/
 
 @v4-periphery/=lib/v4-periphery/src/
 

src/Airlock.sol

@@ -223,7 +223,7 @@ contract Airlock is Ownable {
 
         assetData.liquidityMigrator.migrate(sqrtPriceX96, token0, token1, assetData.timelock);
 
-        emit Migrate(asset, assetData.pool);
+        emit Migrate(asset, assetData.migrationPool);
     }
 
     /**

src/UniswapV2Locker.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.24;
 
-import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
+import { Ownable } from "@openzeppelin/access/Ownable.sol";
 import { SafeTransferLib, ERC20 } from "@solmate/utils/SafeTransferLib.sol";
 import { FixedPointMathLib } from "@solmate/utils/FixedPointMathLib.sol";
 import { IUniswapV2Pair } from "src/interfaces/IUniswapV2Pair.sol";

test/unit/Airlock.t.sol

@@ -318,6 +318,7 @@ contract AirlockTest is Test, Deployers {
         address poolInitializer = makeAddr("PoolInitializer");
         address pool = makeAddr("Pool");
         address liquidityMigrator = makeAddr("LiquidityMigrator");
+        address migrationPool = makeAddr("MigrationPool");
 
         AssetData memory assetData = AssetData({
             numeraire: address(0),
@@ -326,7 +327,7 @@ contract AirlockTest is Test, Deployers {
             liquidityMigrator: ILiquidityMigrator(liquidityMigrator),
             poolInitializer: IPoolInitializer(poolInitializer),
             pool: pool,
-            migrationPool: address(0),
+            migrationPool: migrationPool,
             numTokensToSell: 0,
             totalSupply: 0,
             integrator: DEFAULT_INTEGRATOR
@@ -360,9 +361,8 @@ contract AirlockTest is Test, Deployers {
         MockLiquidityMigrator lm = new MockLiquidityMigrator();
         vm.etch(liquidityMigrator, address(lm).code);
 
-        // TODO: The log look good but Foundry says they are not matching
-        emit Migrate(asset, pool);
-        // vm.expectEmit();
+        vm.expectEmit();
+        emit Migrate(asset, migrationPool);
         airlock.migrate(asset);
     }
 

test/unit/UniswapV2Migrator.t.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.13;
 import { Test } from "forge-std/Test.sol";
 import { TestERC20 } from "@v4-core/test/TestERC20.sol";
 import { TickMath } from "@v4-core/libraries/TickMath.sol";
-import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import { ERC20 } from "@openzeppelin/token/ERC20/ERC20.sol";
 import { UniswapV2Migrator, IUniswapV2Factory, IUniswapV2Router02, IUniswapV2Pair } from "src/UniswapV2Migrator.sol";
 import { SenderNotAirlock } from "src/base/ImmutableAirlock.sol";
 import { MigrationMath } from "src/UniswapV2Migrator.sol";