Merge branch 'testnet-3' of https://github.com/lidofinance/vaults-wrapper into feature/fix-solidity-version

Author: avsetsin

Makefile

@@ -1,5 +1,7 @@
 .ONESHELL:
 
+# TODO: get this deprecated in favour of just
+
 CORE_RPC_PORT ?= 9123
 CORE_BRANCH ?= feat/vaults
 CORE_SUBDIR ?= lido-core
@@ -296,4 +298,4 @@ deploy-all:
 		fi; \
 	done
 
-# WRAPPER_CONFIGS=$${WRAPPER_CONFIGS:-"script/stv-pool-deploy-config-hoodi.json script/stv-steth-pool-deploy-config-hoodi.json script/stv-ggv-pool-deploy-config-hoodi.json"}; \
+# WRAPPER_CONFIGS=$${WRAPPER_CONFIGS:-"script/stv-pool-deploy-config-hoodi.json script/stv-steth-pool-deploy-config-hoodi.json script/stv-ggv-pool-deploy-config-hoodi.json"}; \

script/DeployPool.s.sol

@@ -287,9 +287,6 @@ contract DeployPool is Script {
         Factory.PoolIntermediate memory intermediate = _loadIntermediate(_intermediateJsonPath);
         PoolParams memory p = _loadPoolParams(_intermediateJsonPath);
 
-        StvPool pool = StvPool(payable(intermediate.pool));
-        bytes32 poolType = pool.poolType();
-
         vm.startBroadcast();
 
         _factory.createPoolFinish(intermediate);

src/Factory.sol

@@ -6,13 +6,14 @@ import {TimelockController} from "@openzeppelin/contracts/governance/TimelockCon
 contract TimelockFactory {
     function deploy(uint256 _minDelaySeconds, address _proposer, address _executor)
         external
-        returns (address _timelock)
+        returns (address timelock)
     {
         address[] memory proposers = new address[](1);
         proposers[0] = _proposer;
+
         address[] memory executors = new address[](1);
         executors[0] = _executor;
-        TimelockController tl = new TimelockController(_minDelaySeconds, proposers, executors, address(0));
-        _timelock = address(tl);
+
+        timelock = address(new TimelockController(_minDelaySeconds, proposers, executors, address(0)));
     }
 }

src/factories/TimelockFactory.sol

@@ -380,14 +380,6 @@ contract FactoryTest is Test {
 
     function test_revertFinishWithoutStart() public {
         // Test that calling finish without start reverts
-        (
-            Factory.VaultConfig memory vaultConfig,
-            Factory.CommonPoolConfig memory commonPoolConfig,
-            Factory.AuxiliaryPoolConfig memory auxiliaryConfig
-        ) = _buildConfigs(false, false, 0, "Deadline Test Pool", "DTP");
-
-        Factory.TimelockConfig memory timelockConfig = _defaultTimelockConfig();
-        address strategyFactory = address(0);
 
         // Create an intermediate struct but don't call createPoolStart
         Factory.PoolIntermediate memory fakeIntermediate = Factory.PoolIntermediate({

test/Factory.test.sol

@@ -81,7 +81,7 @@ contract FactoryIntegrationTest is StvPoolHarness {
 
         vm.startPrank(vaultConfig.nodeOperator);
         vm.expectRevert(
-            abi.encodeWithSelector(Factory.InsufficientConnectDeposit.selector, CONNECT_DEPOSIT, CONNECT_DEPOSIT - 1)
+            abi.encodeWithSelector(Factory.InsufficientConnectDeposit.selector, CONNECT_DEPOSIT - 1, CONNECT_DEPOSIT)
         );
         factory.createPoolStart{value: CONNECT_DEPOSIT - 1}(
             vaultConfig, commonPoolConfig, auxiliaryConfig, timelockConfig, strategyFactory, ""
@@ -98,7 +98,7 @@ contract FactoryIntegrationTest is StvPoolHarness {
         ) = _buildConfigs(false, false, 0, "Factory No Mint", "FNM");
         address strategyFactory = address(0);
 
-        (Factory.PoolIntermediate memory intermediate, Factory.PoolDeployment memory deployment) =
+        (, Factory.PoolDeployment memory deployment) =
             _deployThroughFactory(vaultConfig, commonPoolConfig, auxiliaryConfig, timelockConfig, strategyFactory);
 
         assertEq(deployment.strategy, address(0), "strategy should not be deployed");
@@ -124,7 +124,7 @@ contract FactoryIntegrationTest is StvPoolHarness {
         ) = _buildConfigs(false, true, 0, "Factory Mint Pool", "FMP");
         address strategyFactory = address(0);
 
-        (Factory.PoolIntermediate memory intermediate, Factory.PoolDeployment memory deployment) =
+        (, Factory.PoolDeployment memory deployment) =
             _deployThroughFactory(vaultConfig, commonPoolConfig, auxiliaryConfig, timelockConfig, strategyFactory);
 
         IDashboard dashboard = IDashboard(payable(deployment.dashboard));
@@ -142,7 +142,7 @@ contract FactoryIntegrationTest is StvPoolHarness {
         ) = _buildConfigs(true, true, 500, "Factory Strategy Pool", "FSP");
         address strategyFactory = address(factory.GGV_STRATEGY_FACTORY());
 
-        (Factory.PoolIntermediate memory intermediate, Factory.PoolDeployment memory deployment) =
+        (, Factory.PoolDeployment memory deployment) =
             _deployThroughFactory(vaultConfig, commonPoolConfig, auxiliaryConfig, timelockConfig, strategyFactory);
 
         assertTrue(deployment.strategy != address(0), "strategy should be deployed");
@@ -234,7 +234,7 @@ contract FactoryIntegrationTest is StvPoolHarness {
             _deployThroughFactory(vaultConfig, commonPoolConfig, auxiliaryConfig, timelockConfig, strategyFactory);
 
         Vm.Log[] memory entries = vm.getRecordedLogs();
-        bytes32 expectedTopic = keccak256("PoolCreationStarted((address,address,address,bytes))");
+        bytes32 expectedTopic = keccak256("PoolCreationStarted((address,address,address,bytes),uint256)");
 
         bool found;
         for (uint256 i = 0; i < entries.length; i++) {

test/integration/factory.test.sol

@@ -18,7 +18,6 @@ contract TimelockUpgradeIntegrationTest is Test {
         // Deploy a fresh Factory using core addresses discovered from the locator
         string memory locatorAddressStr = vm.envString("CORE_LOCATOR_ADDRESS");
         address locatorAddress = vm.parseAddress(locatorAddressStr);
-        ILidoLocator locator = ILidoLocator(locatorAddress);
 
         FactoryHelper helper = new FactoryHelper();
         factory = helper.deployMainFactory(locatorAddress);

test/integration/timelock-upgrade.test.sol

@@ -99,7 +99,6 @@ contract ExceedingMintedStethTest is Test, SetupStvStETHPool {
             pool.depositETH{value: uint256(assets)}(address(this), address(0));
         }
 
-        uint256 maxSharesToMintOnDashboard = dashboard.remainingMintingCapacityShares(0);
         uint256 maxSharesToMintOnPool = pool.remainingMintingCapacitySharesOf(address(this), 0);
         pool.mintStethShares(maxSharesToMintOnPool);