Skip to content

Commit dd3c905

Browse files
1kresh1kresh
committed
refactor: minors
1 parent 71aa254 commit dd3c905

File tree

3 files changed

+74
-75
lines changed

3 files changed

+74
-75
lines changed

‎script/DeployVault.s.sol‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ contract DeployVaultScript is DeployVaultBase {
1313
// Vault's burner to send slashed funds to (e.g., 0xdEaD or some unwrapper contract; not used in case of no slasher)
1414
address BURNER = 0x0000000000000000000000000000000000000000;
1515
// Duration of the vault epoch (the withdrawal delay for staker varies from EPOCH_DURATION to 2 * EPOCH_DURATION depending on when the withdrawal is requested)
16-
uint48 EPOCH_DURATION = 1 days;
16+
uint48 EPOCH_DURATION = 7 days;
1717
// Type of the delegator:
1818
// 0. NetworkRestakeDelegator (allows restaking across multiple networks and having multiple operators per network)
1919
// 1. FullRestakeDelegator (do not use without knowing what you are doing)
@@ -53,38 +53,39 @@ contract DeployVaultScript is DeployVaultBase {
5353
uint48 RESOLVER_SET_EPOCHS_DELAY = 3;
5454

5555
function run() public {
56-
DeployVaultParams memory params = DeployVaultParams({
57-
owner: OWNER,
58-
vaultParams: VaultParams({
59-
baseParams: IVault.InitParams({
60-
collateral: COLLATERAL,
61-
burner: BURNER,
62-
epochDuration: EPOCH_DURATION,
63-
depositWhitelist: WHITELISTED_DEPOSITORS.length != 0,
64-
isDepositLimit: DEPOSIT_LIMIT != 0,
65-
depositLimit: DEPOSIT_LIMIT,
66-
defaultAdminRoleHolder: OWNER,
67-
depositWhitelistSetRoleHolder: OWNER,
68-
depositorWhitelistRoleHolder: OWNER,
69-
isDepositLimitSetRoleHolder: OWNER,
70-
depositLimitSetRoleHolder: OWNER
56+
run(
57+
DeployVaultParams({
58+
owner: OWNER,
59+
vaultParams: VaultParams({
60+
baseParams: IVault.InitParams({
61+
collateral: COLLATERAL,
62+
burner: BURNER,
63+
epochDuration: EPOCH_DURATION,
64+
depositWhitelist: WHITELISTED_DEPOSITORS.length != 0,
65+
isDepositLimit: DEPOSIT_LIMIT != 0,
66+
depositLimit: DEPOSIT_LIMIT,
67+
defaultAdminRoleHolder: OWNER,
68+
depositWhitelistSetRoleHolder: OWNER,
69+
depositorWhitelistRoleHolder: OWNER,
70+
isDepositLimitSetRoleHolder: OWNER,
71+
depositLimitSetRoleHolder: OWNER
72+
}),
73+
whitelistedDepositors: WHITELISTED_DEPOSITORS
7174
}),
72-
whitelistedDepositors: WHITELISTED_DEPOSITORS
73-
}),
74-
delegatorIndex: DELEGATOR_INDEX,
75-
delegatorParams: DelegatorParams({
76-
baseParams: IBaseDelegator.BaseParams({defaultAdminRoleHolder: OWNER, hook: HOOK, hookSetRoleHolder: OWNER}),
77-
networkAllocationSettersOrNetwork: NETWORK_ALLOCATION_SETTERS_OR_NETWORK,
78-
operatorAllocationSettersOrOperator: OPERATOR_ALLOCATION_SETTERS_OR_OPERATOR
79-
}),
80-
withSlasher: WITH_SLASHER,
81-
slasherIndex: SLASHER_INDEX,
82-
slasherParams: SlasherParams({
83-
baseParams: IBaseSlasher.BaseParams({isBurnerHook: BURNER != address(0)}),
84-
vetoDuration: VETO_DURATION,
85-
resolverSetEpochsDelay: RESOLVER_SET_EPOCHS_DELAY
75+
delegatorIndex: DELEGATOR_INDEX,
76+
delegatorParams: DelegatorParams({
77+
baseParams: IBaseDelegator.BaseParams({defaultAdminRoleHolder: OWNER, hook: HOOK, hookSetRoleHolder: OWNER}),
78+
networkAllocationSettersOrNetwork: NETWORK_ALLOCATION_SETTERS_OR_NETWORK,
79+
operatorAllocationSettersOrOperator: OPERATOR_ALLOCATION_SETTERS_OR_OPERATOR
80+
}),
81+
withSlasher: WITH_SLASHER,
82+
slasherIndex: SLASHER_INDEX,
83+
slasherParams: SlasherParams({
84+
baseParams: IBaseSlasher.BaseParams({isBurnerHook: BURNER != address(0)}),
85+
vetoDuration: VETO_DURATION,
86+
resolverSetEpochsDelay: RESOLVER_SET_EPOCHS_DELAY
87+
})
8688
})
87-
});
88-
run(params);
89+
);
8990
}
9091
}

‎script/DeployVaultTokenized.s.sol‎

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ contract DeployVaultTokenizedScript is DeployVaultTokenizedBase {
1717
// Vault's burner to send slashed funds to (e.g., 0xdEaD or some unwrapper contract; not used in case of no slasher)
1818
address BURNER = 0x0000000000000000000000000000000000000000;
1919
// Duration of the vault epoch (the withdrawal delay for staker varies from EPOCH_DURATION to 2 * EPOCH_DURATION depending on when the withdrawal is requested)
20-
uint48 EPOCH_DURATION = 1 days;
20+
uint48 EPOCH_DURATION = 7 days;
2121
// Type of the delegator:
2222
// 0. NetworkRestakeDelegator (allows restaking across multiple networks and having multiple operators per network)
2323
// 1. FullRestakeDelegator (do not use without knowing what you are doing)
@@ -57,42 +57,43 @@ contract DeployVaultTokenizedScript is DeployVaultTokenizedBase {
5757
uint48 RESOLVER_SET_EPOCHS_DELAY = 3;
5858

5959
function run() public {
60-
DeployVaultTokenizedParams memory params = DeployVaultTokenizedParams({
61-
deployVaultParams: DeployVaultParams({
62-
owner: OWNER,
63-
vaultParams: VaultParams({
64-
baseParams: IVault.InitParams({
65-
collateral: COLLATERAL,
66-
burner: BURNER,
67-
epochDuration: EPOCH_DURATION,
68-
depositWhitelist: WHITELISTED_DEPOSITORS.length != 0,
69-
isDepositLimit: DEPOSIT_LIMIT != 0,
70-
depositLimit: DEPOSIT_LIMIT,
71-
defaultAdminRoleHolder: OWNER,
72-
depositWhitelistSetRoleHolder: OWNER,
73-
depositorWhitelistRoleHolder: OWNER,
74-
isDepositLimitSetRoleHolder: OWNER,
75-
depositLimitSetRoleHolder: OWNER
60+
run(
61+
DeployVaultTokenizedParams({
62+
deployVaultParams: DeployVaultParams({
63+
owner: OWNER,
64+
vaultParams: VaultParams({
65+
baseParams: IVault.InitParams({
66+
collateral: COLLATERAL,
67+
burner: BURNER,
68+
epochDuration: EPOCH_DURATION,
69+
depositWhitelist: WHITELISTED_DEPOSITORS.length != 0,
70+
isDepositLimit: DEPOSIT_LIMIT != 0,
71+
depositLimit: DEPOSIT_LIMIT,
72+
defaultAdminRoleHolder: OWNER,
73+
depositWhitelistSetRoleHolder: OWNER,
74+
depositorWhitelistRoleHolder: OWNER,
75+
isDepositLimitSetRoleHolder: OWNER,
76+
depositLimitSetRoleHolder: OWNER
77+
}),
78+
whitelistedDepositors: WHITELISTED_DEPOSITORS
7679
}),
77-
whitelistedDepositors: WHITELISTED_DEPOSITORS
78-
}),
79-
delegatorIndex: DELEGATOR_INDEX,
80-
delegatorParams: DelegatorParams({
81-
baseParams: IBaseDelegator.BaseParams({defaultAdminRoleHolder: OWNER, hook: HOOK, hookSetRoleHolder: OWNER}),
82-
networkAllocationSettersOrNetwork: NETWORK_ALLOCATION_SETTERS_OR_NETWORK,
83-
operatorAllocationSettersOrOperator: OPERATOR_ALLOCATION_SETTERS_OR_OPERATOR
80+
delegatorIndex: DELEGATOR_INDEX,
81+
delegatorParams: DelegatorParams({
82+
baseParams: IBaseDelegator.BaseParams({defaultAdminRoleHolder: OWNER, hook: HOOK, hookSetRoleHolder: OWNER}),
83+
networkAllocationSettersOrNetwork: NETWORK_ALLOCATION_SETTERS_OR_NETWORK,
84+
operatorAllocationSettersOrOperator: OPERATOR_ALLOCATION_SETTERS_OR_OPERATOR
85+
}),
86+
withSlasher: WITH_SLASHER,
87+
slasherIndex: SLASHER_INDEX,
88+
slasherParams: SlasherParams({
89+
baseParams: IBaseSlasher.BaseParams({isBurnerHook: BURNER != address(0)}),
90+
vetoDuration: VETO_DURATION,
91+
resolverSetEpochsDelay: RESOLVER_SET_EPOCHS_DELAY
92+
})
8493
}),
85-
withSlasher: WITH_SLASHER,
86-
slasherIndex: SLASHER_INDEX,
87-
slasherParams: SlasherParams({
88-
baseParams: IBaseSlasher.BaseParams({isBurnerHook: BURNER != address(0)}),
89-
vetoDuration: VETO_DURATION,
90-
resolverSetEpochsDelay: RESOLVER_SET_EPOCHS_DELAY
91-
})
92-
}),
93-
name: NAME,
94-
symbol: SYMBOL
95-
});
96-
run(params);
94+
name: NAME,
95+
symbol: SYMBOL
96+
})
97+
);
9798
}
9899
}

‎script/base/DeployVaultBase.sol‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ contract DeployVaultBase is Script, Logs {
5050
SlasherParams slasherParams;
5151
}
5252

53+
bytes32 DEFAULT_ADMIN_ROLE = 0x00;
54+
5355
function run(
5456
DeployVaultParams memory params
5557
) public returns (address, address, address) {
@@ -116,8 +118,6 @@ contract DeployVaultBase is Script, Logs {
116118
);
117119
}
118120

119-
120-
121121
(address vault_, address delegator_, address slasher_) = IVaultConfigurator(
122122
SymbioticCoreConstants.core().vaultConfigurator
123123
).create(
@@ -146,10 +146,8 @@ contract DeployVaultBase is Script, Logs {
146146
}
147147

148148
if (deployer != params.vaultParams.baseParams.defaultAdminRoleHolder) {
149-
Vault(vault_).grantRole(
150-
Vault(vault_).DEFAULT_ADMIN_ROLE(), params.vaultParams.baseParams.defaultAdminRoleHolder
151-
);
152-
Vault(vault_).renounceRole(Vault(vault_).DEFAULT_ADMIN_ROLE(), deployer);
149+
Vault(vault_).grantRole(DEFAULT_ADMIN_ROLE, params.vaultParams.baseParams.defaultAdminRoleHolder);
150+
Vault(vault_).renounceRole(DEFAULT_ADMIN_ROLE, deployer);
153151
}
154152
}
155153

@@ -187,7 +185,6 @@ contract DeployVaultBase is Script, Logs {
187185

188186
function _validateOwnershipTransfer(address vault, address delegator, DeployVaultParams memory params) internal {
189187
(,, address oldAdmin) = vm.readCallers();
190-
bytes32 DEFAULT_ADMIN_ROLE = 0x00;
191188
// Validate vault role transfers
192189
assert(Vault(vault).hasRole(DEFAULT_ADMIN_ROLE, params.owner) == true);
193190
assert(Vault(vault).hasRole(Vault(vault).DEPOSIT_LIMIT_SET_ROLE(), params.owner) == true);

0 commit comments

Comments
 (0)