Merge pull request #1581 from lidofinance/chore/voting-script-fixes

feat: remove SetLiabilitySharesTarget factory from vote script

Author: tamtamchik

contracts/upgrade/V3Addresses.sol

@@ -80,7 +80,6 @@ contract V3Addresses {
         address etfSetJailStatusInOperatorGrid;
         address etfUpdateVaultsFeesInOperatorGrid;
         address etfForceValidatorExitsInVaultHub;
-        address etfSetLiabilitySharesTargetInVaultHub;
         address etfSocializeBadDebtInVaultHub;
     }
 
@@ -139,7 +138,6 @@ contract V3Addresses {
     address public immutable ETF_REGISTER_GROUPS_IN_OPERATOR_GRID;
     address public immutable ETF_REGISTER_TIERS_IN_OPERATOR_GRID;
     address public immutable ETF_SET_JAIL_STATUS_IN_OPERATOR_GRID;
-    address public immutable ETF_SET_LIABILITY_SHARES_TARGET_IN_VAULT_HUB;
     address public immutable ETF_SOCIALIZE_BAD_DEBT_IN_VAULT_HUB;
     address public immutable ETF_UPDATE_GROUPS_SHARE_LIMIT_IN_OPERATOR_GRID;
     address public immutable ETF_UPDATE_VAULTS_FEES_IN_OPERATOR_GRID;
@@ -208,7 +206,6 @@ contract V3Addresses {
         ETF_REGISTER_GROUPS_IN_OPERATOR_GRID = params.etfRegisterGroupsInOperatorGrid;
         ETF_REGISTER_TIERS_IN_OPERATOR_GRID = params.etfRegisterTiersInOperatorGrid;
         ETF_SET_JAIL_STATUS_IN_OPERATOR_GRID = params.etfSetJailStatusInOperatorGrid;
-        ETF_SET_LIABILITY_SHARES_TARGET_IN_VAULT_HUB = params.etfSetLiabilitySharesTargetInVaultHub;
         ETF_SOCIALIZE_BAD_DEBT_IN_VAULT_HUB = params.etfSocializeBadDebtInVaultHub;
         ETF_UPDATE_GROUPS_SHARE_LIMIT_IN_OPERATOR_GRID = params.etfUpdateGroupsShareLimitInOperatorGrid;
         ETF_UPDATE_VAULTS_FEES_IN_OPERATOR_GRID = params.etfUpdateVaultsFeesInOperatorGrid;

contracts/upgrade/V3Template.sol

@@ -264,6 +264,8 @@ contract V3Template is V3Addresses {
 
         _assertSingleOZRoleHolder(VAULT_HUB, VaultHub(VAULT_HUB).VALIDATOR_EXIT_ROLE(), VAULTS_ADAPTER);
         _assertSingleOZRoleHolder(VAULT_HUB, VaultHub(VAULT_HUB).BAD_DEBT_MASTER_ROLE(), VAULTS_ADAPTER);
+        _assertZeroOZRoleHolders(VAULT_HUB, VaultHub(VAULT_HUB).REDEMPTION_MASTER_ROLE());
+        _assertZeroOZRoleHolders(VAULT_HUB, VaultHub(VAULT_HUB).VAULT_MASTER_ROLE());
         _assertTwoOZRoleHolders(VAULT_HUB, PausableUntilWithRoles(VAULT_HUB).PAUSE_ROLE(), GATE_SEAL, RESEAL_MANAGER);
         _assertSingleOZRoleHolder(VAULT_HUB, PausableUntilWithRoles(VAULT_HUB).RESUME_ROLE(), RESEAL_MANAGER);
 
@@ -322,16 +324,15 @@ contract V3Template is V3Addresses {
         IEasyTrack easyTrack = IEasyTrack(EASY_TRACK);
         address[] memory factories = easyTrack.getEVMScriptFactories();
 
-        // The expected order of the last 9 EasyTrack factories
-        address[9] memory expectedFactories = [
+        // The expected order of the last 8 EasyTrack factories
+        address[8] memory expectedFactories = [
             ETF_ALTER_TIERS_IN_OPERATOR_GRID,
             ETF_REGISTER_GROUPS_IN_OPERATOR_GRID,
             ETF_REGISTER_TIERS_IN_OPERATOR_GRID,
             ETF_UPDATE_GROUPS_SHARE_LIMIT_IN_OPERATOR_GRID,
             ETF_SET_JAIL_STATUS_IN_OPERATOR_GRID,
             ETF_UPDATE_VAULTS_FEES_IN_OPERATOR_GRID,
             ETF_FORCE_VALIDATOR_EXITS_IN_VAULT_HUB,
-            ETF_SET_LIABILITY_SHARES_TARGET_IN_VAULT_HUB,
             ETF_SOCIALIZE_BAD_DEBT_IN_VAULT_HUB
         ];
 

contracts/upgrade/V3VoteScript.sol

@@ -39,7 +39,6 @@ interface IVaultsAdapter {
     function setVaultJailStatus(address _vault, bool _isInJail) external;
     function updateVaultFees(address _vault, uint16 _infrastructureFeeBP, uint16 _liquidityFeeBP, uint16 _reservationFeeBP) external;
     function forceValidatorExit(address _vault, bytes calldata _pubkeys, address _feeRecipient) external payable;
-    function setLiabilitySharesTarget(address _vault, uint256 _liabilitySharesTarget) external;
     function socializeBadDebt(address _debtVault, address _acceptorVault, uint256 _shares) external;
 }
 
@@ -64,7 +63,7 @@ contract V3VoteScript is OmnibusBase {
     // Constants
     //
     uint256 public constant DG_ITEMS_COUNT = 18;
-    uint256 public constant VOTING_ITEMS_COUNT = 9;
+    uint256 public constant VOTING_ITEMS_COUNT = 8;
 
     //
     // Immutables
@@ -192,21 +191,7 @@ contract V3VoteScript is OmnibusBase {
         });
 
         votingVoteItems[index++] = VoteItem({
-            description: "9. Add SetLiabilitySharesTargetInVaultHub factory to Easy Track (permissions: vaultsAdapter, setLiabilitySharesTarget)",
-            call: ScriptCall({
-                to: easyTrack,
-                data: abi.encodeCall(IEasyTrack.addEVMScriptFactory, (
-                    TEMPLATE.ETF_SET_LIABILITY_SHARES_TARGET_IN_VAULT_HUB(),
-                    bytes.concat(
-                        bytes20(vaultsAdapter),
-                        bytes4(IVaultsAdapter.setLiabilitySharesTarget.selector)
-                    )
-                ))
-            })
-        });
-
-        votingVoteItems[index++] = VoteItem({
-            description: "10. Add SocializeBadDebtInVaultHub factory to Easy Track (permissions: vaultsAdapter, socializeBadDebt)",
+            description: "9. Add SocializeBadDebtInVaultHub factory to Easy Track (permissions: vaultsAdapter, socializeBadDebt)",
             call: ScriptCall({
                 to: easyTrack,
                 data: abi.encodeCall(IEasyTrack.addEVMScriptFactory, (

lib/config-schemas.ts

@@ -87,7 +87,6 @@ const EasyTrackSchema = z.object({
     RegisterGroupsInOperatorGrid: EthereumAddressSchema,
     RegisterTiersInOperatorGrid: EthereumAddressSchema,
     SetJailStatusInOperatorGrid: EthereumAddressSchema,
-    SetLiabilitySharesTargetInVaultHub: EthereumAddressSchema,
     SocializeBadDebtInVaultHub: EthereumAddressSchema,
     ForceValidatorExitsInVaultHub: EthereumAddressSchema,
     UpdateGroupsShareLimitInOperatorGrid: EthereumAddressSchema,

scripts/upgrade/steps/0200-deploy-v3-upgrading-contracts.ts

@@ -65,7 +65,6 @@ export async function main() {
     parameters.easyTrack.newFactories.SetJailStatusInOperatorGrid,
     parameters.easyTrack.newFactories.UpdateVaultsFeesInOperatorGrid,
     parameters.easyTrack.newFactories.ForceValidatorExitsInVaultHub,
-    parameters.easyTrack.newFactories.SetLiabilitySharesTargetInVaultHub,
     parameters.easyTrack.newFactories.SocializeBadDebtInVaultHub,
   ];
 

scripts/upgrade/upgrade-params-hoodi.toml

@@ -28,7 +28,6 @@ AlterTiersInOperatorGrid = "0x00000000000000000000000000000000000fAc01"
 RegisterGroupsInOperatorGrid = "0x00000000000000000000000000000000000fAc02"
 RegisterTiersInOperatorGrid = "0x00000000000000000000000000000000000FAc03"
 SetJailStatusInOperatorGrid = "0x00000000000000000000000000000000000faC04"
-SetLiabilitySharesTargetInVaultHub = "0x00000000000000000000000000000000000FAc05"
 SocializeBadDebtInVaultHub = "0x00000000000000000000000000000000000Fac06"
 ForceValidatorExitsInVaultHub = "0x00000000000000000000000000000000000faC07"
 UpdateGroupsShareLimitInOperatorGrid = "0x00000000000000000000000000000000000FAc08"

scripts/upgrade/upgrade-params-mainnet.toml

@@ -24,7 +24,6 @@ AlterTiersInOperatorGrid = "0x00000000000000000000000000000000000fAc01"
 RegisterGroupsInOperatorGrid = "0x00000000000000000000000000000000000fAc02"
 RegisterTiersInOperatorGrid = "0x00000000000000000000000000000000000FAc03"
 SetJailStatusInOperatorGrid = "0x00000000000000000000000000000000000faC04"
-SetLiabilitySharesTargetInVaultHub = "0x00000000000000000000000000000000000FAc05"
 SocializeBadDebtInVaultHub = "0x00000000000000000000000000000000000Fac06"
 ForceValidatorExitsInVaultHub = "0x00000000000000000000000000000000000faC07"
 UpdateGroupsShareLimitInOperatorGrid = "0x00000000000000000000000000000000000FAc08"