* Update to ganache-cli v6.1.0 and truffle v4.1.0 * Update to stable version of ganache-cli * fix: update event emission warning - Fix event emission warnings for solidity 4.21 after truffle has been updated to use this version * fix pr review comments * update to truffle v4.1.5 * update package-lock * add additional emit keywords * update solidity-coverage to 0.4.15 * update to solium 1.1.6 * fix MerkleProof coverage analysis by testing through wrapper * change version pragma to ^0.4.21 * fix solium linting errors
61 lines
1.1 KiB
Solidity
61 lines
1.1 KiB
Solidity
pragma solidity ^0.4.21;
|
|
|
|
import "./RBAC.sol";
|
|
|
|
|
|
/**
|
|
* @title RBACWithAdmin
|
|
* @author Matt Condon (@Shrugs)
|
|
* @dev It's recommended that you define constants in the contract,
|
|
* @dev like ROLE_ADMIN below, to avoid typos.
|
|
*/
|
|
contract RBACWithAdmin is RBAC {
|
|
/**
|
|
* A constant role name for indicating admins.
|
|
*/
|
|
string public constant ROLE_ADMIN = "admin";
|
|
|
|
/**
|
|
* @dev modifier to scope access to admins
|
|
* // reverts
|
|
*/
|
|
modifier onlyAdmin()
|
|
{
|
|
checkRole(msg.sender, ROLE_ADMIN);
|
|
_;
|
|
}
|
|
|
|
/**
|
|
* @dev constructor. Sets msg.sender as admin by default
|
|
*/
|
|
function RBACWithAdmin()
|
|
public
|
|
{
|
|
addRole(msg.sender, ROLE_ADMIN);
|
|
}
|
|
|
|
/**
|
|
* @dev add a role to an address
|
|
* @param addr address
|
|
* @param roleName the name of the role
|
|
*/
|
|
function adminAddRole(address addr, string roleName)
|
|
onlyAdmin
|
|
public
|
|
{
|
|
addRole(addr, roleName);
|
|
}
|
|
|
|
/**
|
|
* @dev remove a role from an address
|
|
* @param addr address
|
|
* @param roleName the name of the role
|
|
*/
|
|
function adminRemoveRole(address addr, string roleName)
|
|
onlyAdmin
|
|
public
|
|
{
|
|
removeRole(addr, roleName);
|
|
}
|
|
}
|