Skip to content

Commit 906bc8b

Browse files
tsudmitsudmi
authored
Fix default value for validators manager (#126)
1 parent 7c5500a commit 906bc8b

36 files changed

+137
-121
lines changed

‎contracts/vaults/modules/VaultValidators.sol‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ abstract contract VaultValidators is
5252
/// deprecated. Deposit data management is moved to DepositDataRegistry contract
5353
uint256 private __deprecated__validatorIndex;
5454

55-
address private _validatorsManager;
55+
/// @inheritdoc IVaultValidators
56+
address public override validatorsManager;
5657

5758
bytes32 private _initialDomainSeparator;
5859

@@ -88,14 +89,6 @@ abstract contract VaultValidators is
8889
_consolidationsChecker = consolidationsChecker;
8990
}
9091

91-
/// @inheritdoc IVaultValidators
92-
function validatorsManager() public view override returns (address) {
93-
// SLOAD to memory
94-
address validatorsManager_ = _validatorsManager;
95-
// if validatorsManager is not set, use DepositDataRegistry contract address
96-
return validatorsManager_ == address(0) ? _depositDataRegistry : validatorsManager_;
97-
}
98-
9992
/// @inheritdoc IVaultValidators
10093
function registerValidators(
10194
IKeeperValidators.ApprovalParams calldata keeperParams,
@@ -181,13 +174,15 @@ abstract contract VaultValidators is
181174
}
182175

183176
/// @inheritdoc IVaultValidators
184-
function setValidatorsManager(address validatorsManager_) external override {
177+
function setValidatorsManager(address _validatorsManager) external override {
185178
_checkAdmin();
186-
if (validatorsManager_ == _validatorsManager) revert Errors.ValueNotChanged();
179+
if (_validatorsManager == validatorsManager) {
180+
revert Errors.ValueNotChanged();
181+
}
187182

188183
// update validatorsManager address
189-
_validatorsManager = validatorsManager_;
190-
emit ValidatorsManagerUpdated(msg.sender, validatorsManager_);
184+
validatorsManager = _validatorsManager;
185+
emit ValidatorsManagerUpdated(msg.sender, _validatorsManager);
191186
}
192187

193188
/**
@@ -209,21 +204,21 @@ abstract contract VaultValidators is
209204
returns (bool)
210205
{
211206
// SLOAD to memory
212-
address validatorsManager_ = validatorsManager();
213-
if (validatorsManager_ == address(0) || validators.length == 0) {
207+
address _validatorsManager = validatorsManager;
208+
if (_validatorsManager == address(0) || validators.length == 0) {
214209
return false;
215210
}
216211

217212
if (validatorsManagerSignature.length == 0) {
218213
// if no signature is provided, check if the caller is the validators manager
219-
return msg.sender == validatorsManager_;
214+
return msg.sender == _validatorsManager;
220215
}
221216

222217
// check signature
223218
bytes32 domainSeparator =
224219
block.chainid == _initialChainId ? _initialDomainSeparator : _computeVaultValidatorsDomain();
225220
bool isValidSignature = ValidatorUtils.isValidManagerSignature(
226-
nonce, domainSeparator, validatorsManager_, validators, validatorsManagerSignature
221+
nonce, domainSeparator, _validatorsManager, validators, validatorsManagerSignature
227222
);
228223

229224
// update signature nonce
@@ -255,11 +250,14 @@ abstract contract VaultValidators is
255250
// migrate deposit data variables to DepositDataRegistry contract
256251
if (__deprecated__validatorsRoot != bytes32(0)) {
257252
IDepositDataRegistry(_depositDataRegistry).migrate(
258-
__deprecated__validatorsRoot, __deprecated__validatorIndex, _validatorsManager
253+
__deprecated__validatorsRoot, __deprecated__validatorIndex, validatorsManager
259254
);
260255
delete __deprecated__validatorIndex;
261256
delete __deprecated__validatorsRoot;
262-
delete _validatorsManager;
257+
delete validatorsManager;
258+
}
259+
if (validatorsManager == address(0)) {
260+
validatorsManager = _depositDataRegistry;
263261
}
264262
}
265263

‎snapshots/DepositDataRegistryTest.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"DepositDataRegistryTest_test_registerValidator_succeedsWith0x01Validator": "272572",
3-
"DepositDataRegistryTest_test_registerValidator_succeedsWith0x02Validator": "295478",
4-
"DepositDataRegistryTest_test_registerValidators_successWith0x01Validators": "314050",
5-
"DepositDataRegistryTest_test_registerValidators_successWith0x02Validators": "338119",
2+
"DepositDataRegistryTest_test_registerValidator_succeedsWith0x01Validator": "272487",
3+
"DepositDataRegistryTest_test_registerValidator_succeedsWith0x02Validator": "295393",
4+
"DepositDataRegistryTest_test_registerValidators_successWith0x01Validators": "313965",
5+
"DepositDataRegistryTest_test_registerValidators_successWith0x02Validators": "338034",
66
"DepositDataRegistryTest_test_setDepositDataManager_succeeds": "66206",
77
"DepositDataRegistryTest_test_setDepositDataRoot_succeeds": "65127",
88
"DepositDataRegistryTest_test_updateVaultState_succeeds": "128302"

‎snapshots/EthBlocklistErc20VaultTest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
"EthBlocklistErc20VaultTest_test_canMintOsTokenAsNonBlockedUser": "161501",
55
"EthBlocklistErc20VaultTest_test_deploysCorrectly": "625440",
66
"EthBlocklistErc20VaultTest_test_transfer": "61693",
7-
"EthBlocklistErc20VaultTest_test_upgradesCorrectly": "89988"
7+
"EthBlocklistErc20VaultTest_test_upgradesCorrectly": "112276"
88
}

‎snapshots/EthBlocklistVaultTest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"EthBlocklistVaultTest_test_canDepositUsingReceiveAsNotBlockedUser": "82360",
44
"EthBlocklistVaultTest_test_canMintOsTokenAsNonBlockedUser": "161528",
55
"EthBlocklistVaultTest_test_deploysCorrectly": "550241",
6-
"EthBlocklistVaultTest_test_upgradesCorrectly": "89319"
6+
"EthBlocklistVaultTest_test_upgradesCorrectly": "111607"
77
}

‎snapshots/EthErc20VaultTest.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"EthErc20VaultTest_test_redeem_emitsEvent": "58285",
1010
"EthErc20VaultTest_test_updateExitQueue_emitsTransfer": "177077",
1111
"EthErc20VaultTest_test_updateStateAndDepositAndMintOsToken": "227535",
12-
"EthErc20VaultTest_test_upgradesCorrectly": "89862",
13-
"EthErc20VaultTest_test_withdrawValidator_unknown": "56036",
14-
"EthErc20VaultTest_test_withdrawValidator_validatorsManager": "74188"
12+
"EthErc20VaultTest_test_upgradesCorrectly": "112150",
13+
"EthErc20VaultTest_test_withdrawValidator_unknown": "55951",
14+
"EthErc20VaultTest_test_withdrawValidator_validatorsManager": "74092"
1515
}

‎snapshots/EthFoxVaultTest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"EthFoxVaultTest_test_canDepositUsingReceiveAsNotBlockedUser": "81932",
44
"EthFoxVaultTest_test_ejectUser": "107257",
55
"EthFoxVaultTest_test_ejectUserWithNoShares": "62862",
6-
"EthFoxVaultTest_test_withdrawValidator_unknown": "55971",
7-
"EthFoxVaultTest_test_withdrawValidator_validatorsManager": "74060"
6+
"EthFoxVaultTest_test_withdrawValidator_unknown": "55886",
7+
"EthFoxVaultTest_test_withdrawValidator_validatorsManager": "73964"
88
}

‎snapshots/EthGenesisVaultTest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"EthGenesisVaultTest_test_fallback_acceptsEtherFromPoolEscrow": "33277",
44
"EthGenesisVaultTest_test_fallback_acceptsEtherFromUser": "77540",
55
"EthGenesisVaultTest_test_migrate_works": "201753",
6-
"EthGenesisVaultTest_test_upgradesCorrectly": "68854",
7-
"GnoGenesisVaultTest_test_pullWithdrawals_claimEscrowAssets": "803468"
6+
"EthGenesisVaultTest_test_upgradesCorrectly": "91142",
7+
"GnoGenesisVaultTest_test_pullWithdrawals_claimEscrowAssets": "803339"
88
}

‎snapshots/EthPrivErc20VaultTest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
"EthPrivErc20VaultTest_test_canMintOsTokenAsWhitelistedUser": "161601",
66
"EthPrivErc20VaultTest_test_deploysCorrectly": "625462",
77
"EthPrivErc20VaultTest_test_transfer": "59709",
8-
"EthPrivErc20VaultTest_test_upgradesCorrectly": "90008"
8+
"EthPrivErc20VaultTest_test_upgradesCorrectly": "112296"
99
}

‎snapshots/EthPrivVaultTest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
"EthPrivVaultTest_test_depositAndMintOsTokenAsWhitelistedUser": "200570",
88
"EthPrivVaultTest_test_setWhitelister": "36608",
99
"EthPrivVaultTest_test_updateWhitelist": "54543",
10-
"EthPrivVaultTest_test_upgradesCorrectly": "89434"
10+
"EthPrivVaultTest_test_upgradesCorrectly": "111722"
1111
}

‎snapshots/EthVaultTest.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"EthVaultTest_test_exitQueue_works": "96643",
55
"EthVaultTest_test_fallbackDeposit": "75127",
66
"EthVaultTest_test_updateStateAndDepositAndMintOsToken": "228158",
7-
"EthVaultTest_test_upgradesCorrectly": "89278",
8-
"EthVaultTest_test_withdrawValidator_unknown": "56069",
9-
"EthVaultTest_test_withdrawValidator_validatorsManager": "74210"
7+
"EthVaultTest_test_upgradesCorrectly": "111566",
8+
"EthVaultTest_test_withdrawValidator_unknown": "55973",
9+
"EthVaultTest_test_withdrawValidator_validatorsManager": "74114"
1010
}

0 commit comments

Comments
 (0)