Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor modifiers privilege #243

Merged
merged 4 commits into from
Oct 20, 2023
Merged

Refactor modifiers privilege #243

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c42530d
refactor: rename modifier with privilege
MerlinEgalite Oct 20, 2023
168e8eb
refactor: use role wording instead
MerlinEgalite Oct 20, 2023
be2f2a7
test: rename tests
MerlinEgalite Oct 20, 2023
a42ff47
Merge branch 'main' of github.com:morpho-labs/morpho-blue-metamorpho …
MerlinEgalite Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/MetaMorpho.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,15 @@ contract MetaMorpho is ERC4626, ERC20Permit, Ownable2Step, Multicall, IMetaMorph
/* MODIFIERS */

/// @dev Reverts if the caller doesn't have the curator's privilege.
modifier onlyCurator() {
modifier hasCuratorPrivilege() {
MerlinEgalite marked this conversation as resolved.
Show resolved Hide resolved
address sender = _msgSender();
if (sender != curator && sender != owner()) revert ErrorsLib.NotCurator();

_;
}

/// @dev Reverts if the caller doesn't have the allocator's privilege.
modifier onlyAllocator() {
modifier hasAllocatorPrivilege() {
address sender = _msgSender();
if (!isAllocator[sender] && sender != curator && sender != owner()) {
revert ErrorsLib.NotAllocator();
Expand Down Expand Up @@ -251,7 +251,7 @@ contract MetaMorpho is ERC4626, ERC20Permit, Ownable2Step, Multicall, IMetaMorph
/* ONLY CURATOR FUNCTIONS */

/// @notice Submits a `newMarketCap` for the market defined by `marketParams`.
function submitCap(MarketParams memory marketParams, uint256 newMarketCap) external onlyCurator {
function submitCap(MarketParams memory marketParams, uint256 newMarketCap) external hasCuratorPrivilege {
Id id = marketParams.id();
if (marketParams.loanToken != asset()) revert ErrorsLib.InconsistentAsset(id);
if (MORPHO.lastUpdate(id) == 0) revert ErrorsLib.MarketNotCreated();
Expand All @@ -273,7 +273,7 @@ contract MetaMorpho is ERC4626, ERC20Permit, Ownable2Step, Multicall, IMetaMorph
/// @notice Sets `supplyQueue` to `newSupplyQueue`.
/// @dev The supply queue can be a set containing duplicate markets, but it would only increase the cost of
/// depositing to the vault.
function setSupplyQueue(Id[] calldata newSupplyQueue) external onlyAllocator {
function setSupplyQueue(Id[] calldata newSupplyQueue) external hasAllocatorPrivilege {
for (uint256 i; i < newSupplyQueue.length; ++i) {
if (config[newSupplyQueue[i]].cap == 0) revert ErrorsLib.UnauthorizedMarket(newSupplyQueue[i]);
}
Expand All @@ -289,7 +289,7 @@ contract MetaMorpho is ERC4626, ERC20Permit, Ownable2Step, Multicall, IMetaMorph
/// vault so the call to `sortWithdrawQueue` can be griefed by a frontrun. To circumvent this, the allocator can
/// simply bundle a reallocation that withdraws max from this market with a call to `sortWithdrawQueue`.
/// @param indexes The indexes of each market in the previous withdraw queue, in the new withdraw queue's order.
function sortWithdrawQueue(uint256[] calldata indexes) external onlyAllocator {
function sortWithdrawQueue(uint256[] calldata indexes) external hasAllocatorPrivilege {
uint256 newLength = indexes.length;
uint256 currLength = withdrawQueue.length;

Expand Down Expand Up @@ -331,7 +331,7 @@ contract MetaMorpho is ERC4626, ERC20Permit, Ownable2Step, Multicall, IMetaMorph
/// `supplied`).
function reallocate(MarketAllocation[] calldata withdrawn, MarketAllocation[] calldata supplied)
external
onlyAllocator
hasAllocatorPrivilege
{
uint256 totalWithdrawn;
for (uint256 i; i < withdrawn.length; ++i) {
Expand Down
Loading