Feat/security council - #270
Merged
Merged
Conversation
…the change of entryRate doesn't affect claim
…lt factory to support v0_6_0; rename various vault files to avoid output confusion
… and fix tests broken by 0 division
jfrancai
reviewed
Feb 4, 2026
Contributor
There was a problem hiding this comment.
we should not touch v0.5.0 files in this pr
Contributor
There was a problem hiding this comment.
we should not touch v0.5.0 files in this pr
| /// @param performanceRate The performance fee rate. | ||
| /// @param rateUpdateCooldown The cooldown period for updating the fee rates. | ||
| /// @param enableWhitelist A boolean indicating whether the whitelist is enabled. | ||
| struct InitStruct { |
Contributor
There was a problem hiding this comment.
we need to have this in one place only. It's currently defined in this file, VaultInit and the factories which often break tests etc when we forgot to update
| /// @notice Performance fee rate (in basis points) | ||
| uint16 performanceRate; | ||
| /// @notice Flag to enable whitelist functionality | ||
| bool enableWhitelist; |
| /// @title InitStruct | ||
| /// @notice Initialization structure for creating new vault proxies | ||
| /// @dev Contains all necessary parameters to initialize a vault | ||
| struct InitStruct { |
Contributor
There was a problem hiding this comment.
we should import the struct and not re declare it
| RolesLib.updateSafe(_safe); | ||
| } | ||
|
|
||
| function giveUpSafeUpgradeability() external onlyOwner { |
| /// @custom:storage-definition erc7201:hopper.storage.Whitelistable | ||
| /// @param isWhitelisted The mapping of whitelisted addresses. | ||
| /// @param isActivated The flag to check if the whitelist is activated. | ||
| /// @param whitelistState The current whitelist mode (whitelist or blacklist). |
| vm.prank(operator); | ||
| vm.expectRevert(ERC7540InvalidOperator.selector); | ||
| vault.requestDeposit(100, controller, controller, controller); | ||
| // Note: safe cannot call requestDeposit for users - onlyOperator excludes safe |
Contributor
There was a problem hiding this comment.
merge error the tests were legit
| return RolesLib._getRolesStorage().feeRegistry.protocolFeeReceiver(); | ||
| } | ||
|
|
||
| function gaveUpSafeUpgradeability() public view returns (bool) { |
Contributor
There was a problem hiding this comment.
updateRates does not check MAX_HAIRCUT_RATE
- Revert v0.5.0 files to main branch state - Add separate security council entry point (securityCouncilUpdateTotalAssets) - Add haircutRate validation in FeeLib.updateRates() - Add haircutRate to InitStruct and FeeManager init - Add HaircutTaken event emission in syncRedeem - Fix duplicate imports in RolesLib.sol - Fix natspecs (syncRedeem, Whitelistable, Roles) - Import InitStruct in protocol-v3 factory instead of redeclaring - Reorder FeeLib constants (MAX_HAIRCUT_RATE after MAX_PROTOCOL_RATE) - Update tests for new security council function
- Fix comment style // to /// for modifiers in Vault-v0.6.0.sol - Fix typo "maximun" to "maximum" in Vault-v0.6.0.sol - Fix typo "express" to "expressed" in FeeLib.sol - Fix wrong storage reference "FeeManager" to "GuardrailsManager" in GuardrailsLib.sol - Convert JSDoc style to /// natspec in GuardrailsLib.sol - Fix invalid @inheritdoc to actual natspec in GuardrailsManager.sol - Add missing @PARAM haircutRate in Struct.sol - Change @PARAM owner to @dev owner in Roles.sol (not a struct field) - Add missing @PARAM sharesToRedeem in Vault-v0.6.0.sol - Add missing @PARAM _logic in OptinProxyFactory.sol
fix: address PR #270 review comments
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.