vacp2p/staking-reward-streamer
1
0
Fork 0
mirror of https://github.com/vacp2p/staking-reward-streamer.git synced 2026-01-09 13:08:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor StakeManager to support AccessControl

Browse Source
This commit is contained in:
Filip Pajic
2025-08-28 13:04:22 +02:00
parent e39b20a959
commit cf6124f4fd
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/StakeManager.sol
View File

@@ -79,7 +79,7 @@ contract StakeManager is
address public guardian; address public guardian;
modifier onlyAdminOrGuardian() { modifier onlyAdminOrGuardian() {
if (msg.sender != guardian && msg.sender != owner()) { if (msg.sender != guardian && !hasRole(DEFAULT_ADMIN_ROLE, msg.sender)) {
revert StakeManager__Unauthorized(); revert StakeManager__Unauthorized();
} }
_; _;
@@ -141,11 +141,11 @@ contract StakeManager is
* @dev The supplier is going to be the `Karma` token. * @dev The supplier is going to be the `Karma` token.
* @param _rewardsSupplier The address of the rewards supplier. * @param _rewardsSupplier The address of the rewards supplier.
*/ */
function setRewardsSupplier(address _rewardsSupplier) external onlyOwner onlyNotEmergencyMode { function setRewardsSupplier(address _rewardsSupplier) external onlyRole(DEFAULT_ADMIN_ROLE) onlyNotEmergencyMode {
rewardsSupplier = _rewardsSupplier; rewardsSupplier = _rewardsSupplier;
} }
function setGuardian(address _guardian) external onlyOwner onlyNotEmergencyMode { function setGuardian(address _guardian) external onlyRole(DEFAULT_ADMIN_ROLE) onlyNotEmergencyMode {
guardian = _guardian; guardian = _guardian;
} }
@@ -589,7 +589,9 @@ contract StakeManager is
* @dev This function is only callable by the owner. * @dev This function is only callable by the owner.
*/ */
function _authorizeUpgrade(address) internal view override { function _authorizeUpgrade(address) internal view override {
_checkOwner(); if (!hasRole(DEFAULT_ADMIN_ROLE, msg.sender)) {
revert StakeManager__Unauthorized();
}
} }
/*////////////////////////////////////////////////////////////////////////// /*//////////////////////////////////////////////////////////////////////////

7
src/TrustedCodehashAccess.sol
View File

@@ -3,6 +3,7 @@ pragma solidity 0.8.26;
import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
import { ITrustedCodehashAccess } from "./interfaces/ITrustedCodehashAccess.sol"; import { ITrustedCodehashAccess } from "./interfaces/ITrustedCodehashAccess.sol";
import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
/** /**
* @title TrustedCodehashAccess * @title TrustedCodehashAccess
@@ -11,7 +12,7 @@ import { ITrustedCodehashAccess } from "./interfaces/ITrustedCodehashAccess.sol"
* interact with the functions using the `onlyTrustedCodehash` modifier. * interact with the functions using the `onlyTrustedCodehash` modifier.
* @dev This contract is used to restrict access to functions based on the codehash of the caller. * @dev This contract is used to restrict access to functions based on the codehash of the caller.
*/ */
abstract contract TrustedCodehashAccess is ITrustedCodehashAccess, OwnableUpgradeable { abstract contract TrustedCodehashAccess is ITrustedCodehashAccess, AccessControlUpgradeable {
/// @notice Whidelisted codehashes. /// @notice Whidelisted codehashes.
mapping(bytes32 codehash => bool permission) private trustedCodehashes; mapping(bytes32 codehash => bool permission) private trustedCodehashes;
/// @notice Gap for upgrade safety. /// @notice Gap for upgrade safety.
@@ -36,7 +37,7 @@ abstract contract TrustedCodehashAccess is ITrustedCodehashAccess, OwnableUpgrad
* @param _initialOwner The address of the owner. * @param _initialOwner The address of the owner.
*/ */
function __TrustedCodehashAccess_init(address _initialOwner) public onlyInitializing { function __TrustedCodehashAccess_init(address _initialOwner) public onlyInitializing {
_transferOwnership(_initialOwner); _setupRole(DEFAULT_ADMIN_ROLE, _initialOwner);
} }
/** /**
@@ -45,7 +46,7 @@ abstract contract TrustedCodehashAccess is ITrustedCodehashAccess, OwnableUpgrad
* @param _codehash The bytecode hash of the contract. * @param _codehash The bytecode hash of the contract.
* @param _trusted Boolean flag to designate the contract as trusted or not. * @param _trusted Boolean flag to designate the contract as trusted or not.
*/ */
function setTrustedCodehash(bytes32 _codehash, bool _trusted) external onlyOwner { function setTrustedCodehash(bytes32 _codehash, bool _trusted) external onlyRole(DEFAULT_ADMIN_ROLE) {
trustedCodehashes[_codehash] = _trusted; trustedCodehashes[_codehash] = _trusted;
emit TrustedCodehashUpdated(_codehash, _trusted); emit TrustedCodehashUpdated(_codehash, _trusted);
} }

4
test/mocks/StackOverflowStakeManager.sol
View File

@@ -71,7 +71,9 @@ contract StackOverflowStakeManager is UUPSUpgradeable, IStakeManager, TrustedCod
} }
function _authorizeUpgrade(address) internal view override { function _authorizeUpgrade(address) internal view override {
_checkOwner(); if (!hasRole(DEFAULT_ADMIN_ROLE, msg.sender)) {
revert StakeManager__Unauthorized();
}
} }
function getAccount(address _account) external view returns (Account memory) { function getAccount(address _account) external view returns (Account memory) {