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

Fixes Issue #169 - Repeated pause validation #170

Merged
merged 1 commit into from
Sep 8, 2022
+10 −15
Merged

Fixes Issue #169 - Repeated pause validation #170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 10 additions & 15 deletions contracts/core/Protocol.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ contract Protocol is IProtocol, ProtoBase {
* @param member Enter an address to add as a protocol member
*/
function addMember(address member) external override nonReentrant whenNotPaused {
s.mustNotBePaused();
AccessControlLibV1.mustBeUpgradeAgent(s);

AccessControlLibV1.addMemberInternal(s, member);
Expand All @@ -154,7 +153,6 @@ contract Protocol is IProtocol, ProtoBase {
*/
function removeMember(address member) external override nonReentrant whenNotPaused {
ProtoUtilV1.mustBeProtocolMember(s, member);
s.mustNotBePaused();
AccessControlLibV1.mustBeUpgradeAgent(s);

AccessControlLibV1.removeMemberInternal(s, member);
Expand Down Expand Up @@ -204,7 +202,6 @@ contract Protocol is IProtocol, ProtoBase {
) public override nonReentrant whenNotPaused {
require(contractAddress != address(0), "Invalid contract");

s.mustNotBePaused();
AccessControlLibV1.mustBeUpgradeAgent(s);
address current = s.getProtocolContract(namespace);

Expand Down Expand Up @@ -262,26 +259,24 @@ contract Protocol is IProtocol, ProtoBase {

ProtoUtilV1.mustBeProtocolMember(s, previous);
ProtoUtilV1.mustBeExactContract(s, namespace, key, previous);
s.mustNotBePaused();
AccessControlLibV1.mustBeUpgradeAgent(s);

AccessControlLibV1.upgradeContractInternal(s, namespace, key, previous, current);
emit ContractUpgraded(namespace, key, previous, current);
}


/**
* @dev Grants `role` to `account`.
*
* If `account` had not been already granted `role`, emits a {RoleGranted}
* event.
*
* Requirements:
*
* - the caller must have ``role``'s admin role.
*/
* @dev Grants `role` to `account`.
*
* If `account` had not been already granted `role`, emits a {RoleGranted}
* event.
*
* Requirements:
*
* - the caller must have ``role``'s admin role.
*/
function grantRole(bytes32 role, address account) public override(AccessControl, IAccessControl) whenNotPaused {
super.grantRole(role, account);
super.grantRole(role, account);
}

/**
Expand Down