Merge pull request #297 from whetstoneresearch/cantina-fix/lp-unlock

Cantina fix/lp unlock
whetstoneresearch · Jan 28, 2025 · 0685ba9 · 0685ba9
2 parents 27d0eb4 + 3cdb921
commit 0685ba9
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 12 deletions.
diff --git a/script/DeployFactory.sol b/script/DeployFactory.sol
@@ -61,7 +61,8 @@ contract DeployFactoriesWorldChain is Script {
         uniswapV2LiquidityMigrator = new UniswapV2Migrator(
             address(airlock),
             IUniswapV2Factory(uniFactoryV2),
-            IUniswapV2Router02(0x541aB7c31A119441eF3575F6973277DE0eF460bd)
+            IUniswapV2Router02(0x541aB7c31A119441eF3575F6973277DE0eF460bd),
+            address(0)
         );
         console2.log("Migrator: ", address(uniswapV2LiquidityMigrator));
         console2.log(airlock.owner());

diff --git a/script/DeployFactoryUnichainSepolia.sol b/script/DeployFactoryUnichainSepolia.sol
@@ -53,8 +53,9 @@ contract DeployDopplerV3FactoryUnichainSepolia is Script {
         console2.log("UniswapV3Initializer: ", address(uniswapV3Initializer));
         governanceFactory = new GovernanceFactory(address(airlock));
         console2.log("GovernanceFactory: ", address(governanceFactory));
-        uniswapV2LiquidityMigrator =
-            new UniswapV2Migrator(address(airlock), IUniswapV2Factory(uniFactoryV2), IUniswapV2Router02(uniRouterV2));
+        uniswapV2LiquidityMigrator = new UniswapV2Migrator(
+            address(airlock), IUniswapV2Factory(uniFactoryV2), IUniswapV2Router02(uniRouterV2), address(0)
+        );
         console2.log("Migrator: ", address(uniswapV2LiquidityMigrator));
         console2.log("StateView: ", address(stateView));
         console2.log("Quoter: ", address(quoter));

diff --git a/src/UniswapV2Locker.sol b/src/UniswapV2Locker.sol
@@ -56,7 +56,12 @@ contract UniswapV2Locker is Ownable {
     /**
      * @param factory_ Address of the Uniswap V2 factory
      */
-    constructor(Airlock airlock_, IUniswapV2Factory factory_, UniswapV2Migrator migrator_) Ownable(msg.sender) {
+    constructor(
+        Airlock airlock_,
+        IUniswapV2Factory factory_,
+        UniswapV2Migrator migrator_,
+        address owner_
+    ) Ownable(owner_) {
         airlock = airlock_;
         factory = factory_;
         migrator = migrator_;

diff --git a/src/UniswapV2Migrator.sol b/src/UniswapV2Migrator.sol
@@ -40,11 +40,11 @@ contract UniswapV2Migrator is ILiquidityMigrator {
     /**
      * @param factory_ Address of the Uniswap V2 factory
      */
-    constructor(address airlock_, IUniswapV2Factory factory_, IUniswapV2Router02 router) {
+    constructor(address airlock_, IUniswapV2Factory factory_, IUniswapV2Router02 router, address owner) {
         airlock = airlock_;
         factory = factory_;
         weth = IWETH(payable(router.WETH()));
-        locker = new UniswapV2Locker(Airlock(payable(airlock)), factory, this);
+        locker = new UniswapV2Locker(Airlock(payable(airlock)), factory, this, owner);
     }
 
     function initialize(address asset, address numeraire, bytes calldata) external returns (address) {

diff --git a/test/integration/V3.t.sol b/test/integration/V3.t.sol
@@ -49,7 +49,8 @@ contract V3Test is Test {
         uniswapV2LiquidityMigrator = new UniswapV2Migrator(
             address(airlock),
             IUniswapV2Factory(UNISWAP_V2_FACTORY_MAINNET),
-            IUniswapV2Router02(UNISWAP_V2_ROUTER_MAINNET)
+            IUniswapV2Router02(UNISWAP_V2_ROUTER_MAINNET),
+            address(0)
         );
         tokenFactory = new TokenFactory(address(airlock));
         governanceFactory = new GovernanceFactory(address(airlock));

diff --git a/test/shared/V3PocTest.sol b/test/shared/V3PocTest.sol
@@ -40,7 +40,8 @@ contract V3PocTest is Test {
         uniswapV2LiquidityMigrator = new UniswapV2Migrator(
             address(airlock),
             IUniswapV2Factory(UNISWAP_V2_FACTORY_MAINNET),
-            IUniswapV2Router02(UNISWAP_V2_ROUTER_MAINNET)
+            IUniswapV2Router02(UNISWAP_V2_ROUTER_MAINNET),
+            address(0)
         );
         tokenFactory = new TokenFactory(address(airlock));
         governanceFactory = new GovernanceFactory(address(airlock));

diff --git a/test/unit/Airlock.t.sol b/test/unit/Airlock.t.sol
@@ -94,7 +94,8 @@ contract AirlockTest is Test, Deployers {
         uniswapV2LiquidityMigrator = new UniswapV2Migrator(
             address(airlock),
             IUniswapV2Factory(UNISWAP_V2_FACTORY_MAINNET),
-            IUniswapV2Router02(UNISWAP_V2_ROUTER_MAINNET)
+            IUniswapV2Router02(UNISWAP_V2_ROUTER_MAINNET),
+            address(0)
         );
 
         address[] memory modules = new address[](5);

diff --git a/test/unit/UniswapV2Locker.t.sol b/test/unit/UniswapV2Locker.t.sol
@@ -33,7 +33,7 @@ contract UniswapV2LockerTest is Test {
         tokenFoo = new TestERC20(1e25);
         tokenBar = new TestERC20(1e25);
 
-        locker = new UniswapV2Locker(airlock, IUniswapV2Factory(UNISWAP_V2_FACTORY_MAINNET), migrator);
+        locker = new UniswapV2Locker(airlock, IUniswapV2Factory(UNISWAP_V2_FACTORY_MAINNET), migrator, address(0));
 
         pool = IUniswapV2Pair(
             IUniswapV2Factory(UNISWAP_V2_FACTORY_MAINNET).createPair(address(tokenFoo), address(tokenBar))

diff --git a/test/unit/UniswapV2Migrator.t.sol b/test/unit/UniswapV2Migrator.t.sol
@@ -18,7 +18,10 @@ contract UniswapV2MigratorTest is Test {
     function setUp() public {
         vm.createSelectFork(vm.envString("MAINNET_RPC_URL"), 21_093_509);
         migrator = new UniswapV2Migrator(
-            address(this), IUniswapV2Factory(UNISWAP_V2_FACTORY_MAINNET), IUniswapV2Router02(UNISWAP_V2_ROUTER_MAINNET)
+            address(this),
+            IUniswapV2Factory(UNISWAP_V2_FACTORY_MAINNET),
+            IUniswapV2Router02(UNISWAP_V2_ROUTER_MAINNET),
+            address(0)
         );
     }
 

diff --git a/test/unit/UniswapV4Initializer.t.sol b/test/unit/UniswapV4Initializer.t.sol
@@ -85,7 +85,7 @@ contract UniswapV4InitializerTest is Test, Deployers {
         initializer = new UniswapV4Initializer(address(airlock), manager, deployer);
         tokenFactory = new TokenFactory(address(airlock));
         governanceFactory = new GovernanceFactory(address(airlock));
-        migrator = new UniswapV2Migrator(address(airlock), uniswapV2Factory, uniswapV2Router);
+        migrator = new UniswapV2Migrator(address(airlock), uniswapV2Factory, uniswapV2Router, address(0));
 
         address[] memory modules = new address[](4);
         modules[0] = address(tokenFactory);