Merge branch 'v2' into migrator

Author: sunbreak1211

deploy/LockstakeInit.sol

@@ -34,7 +34,6 @@ interface LockstakeEngineLike {
     function fee() external view returns (uint256);
     function rely(address) external;
     function file(bytes32, address) external;
-    function file(bytes32, uint256) external;
     function addFarm(address) external;
 }
 
@@ -164,7 +163,7 @@ library LockstakeInit {
         require(se.engine.usds()                == dss.chainlog.getAddress("USDS"),                  "Engine usds mismatch");
         require(se.engine.ilk()                 == cfg.ilk,                                          "Engine ilk mismatch");
         require(se.engine.sky()                 == sky,                                              "Engine sky mismatch");
-        require(se.engine.lssky()               == address(se.lssky),                                "Engine lsssky mismatch");
+        require(se.engine.lssky()               == address(se.lssky),                                "Engine lssky mismatch");
         require(se.engine.fee()                 == cfg.fee,                                          "Engine fee mismatch");
         require(se.clipper.ilk()                == cfg.ilk,                                          "Clipper ilk mismatch");
         require(se.clipper.vat()                == address(dss.vat),                                 "Clipper vat mismatch");

src/LockstakeEngine.sol

@@ -102,9 +102,7 @@ contract LockstakeEngine is Multicall {
     event SelectVoteDelegate(address indexed owner, uint256 indexed index, address indexed voteDelegate);
     event SelectFarm(address indexed owner, uint256 indexed index, address indexed farm, uint16 ref);
     event Lock(address indexed owner, uint256 indexed index, uint256 wad, uint16 ref);
-    event LockSky(address indexed owner, uint256 indexed index, uint256 skyWad, uint16 ref);
     event Free(address indexed owner, uint256 indexed index, address to, uint256 wad, uint256 freed);
-    event FreeSky(address indexed owner, uint256 indexed index, address to, uint256 skyWad, uint256 skyFreed);
     event FreeNoFee(address indexed owner, uint256 indexed index, address to, uint256 wad);
     event Draw(address indexed owner, uint256 indexed index, address to, uint256 wad);
     event Wipe(address indexed owner, uint256 indexed index, uint256 wad);