Skip to content

poc : proxy admin access manager #1269

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

Draft
Kogaroshi wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

poc : proxy admin access manager #1269

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions src/libraries/types/Roles.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ library Roles {
uint64 public constant HUB_CONFIGURATOR_ROLE = 4;
uint64 public constant SPOKE_CONFIGURATOR_ROLE = 5;
uint64 public constant DEFICIT_ELIMINATOR_ROLE = 6;
uint64 public constant PROXY_ADMIN_ROLE = 7;
}
60 changes: 60 additions & 0 deletions tests/unit/Spoke/Spoke.Upgradeable.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,66 @@ contract SpokeUpgradeableTest is SpokeBase {
);
}

function test_proxy_accessManager_ownershipRole() public {
address proxyAdmin1 = makeAddr('proxyAdmin1');
address proxyAdmin2 = makeAddr('proxyAdmin2');

uint64 initialRevision = 1;
ISpokeInstance spokeImpl = _deployMockSpokeInstance(initialRevision);
ITransparentUpgradeableProxy spokeProxy = ITransparentUpgradeableProxy(
address(
new TransparentUpgradeableProxy(
address(spokeImpl),
address(accessManager),
abi.encodeCall(ISpokeInstance.initialize, address(accessManager))
)
)
);

ProxyAdmin proxyAdmin = ProxyAdmin(_getProxyAdminAddress(address(spokeProxy)));

vm.startPrank(ADMIN);
accessManager.labelRole(Roles.PROXY_ADMIN_ROLE, 'PROXY_ADMIN_ROLE');
accessManager.setGrantDelay(Roles.PROXY_ADMIN_ROLE, 0);

accessManager.grantRole(Roles.PROXY_ADMIN_ROLE, proxyAdmin1, 0);
accessManager.grantRole(Roles.PROXY_ADMIN_ROLE, proxyAdmin2, 0);

bytes4[] memory selectors = new bytes4[](1);
selectors[0] = ProxyAdmin.upgradeAndCall.selector;
accessManager.setTargetFunctionRole(address(proxyAdmin), selectors, Roles.PROXY_ADMIN_ROLE);
vm.stopPrank();

ISpokeInstance spokeImpl2 = _deployMockSpokeInstance(initialRevision + 1);
ISpokeInstance spokeImpl3 = _deployMockSpokeInstance(initialRevision + 2);

vm.prank(proxyAdmin1);
accessManager.execute(
address(proxyAdmin),
abi.encodeWithSelector(
ProxyAdmin.upgradeAndCall.selector,
spokeProxy,
address(spokeImpl2),
_getInitializeCalldata(address(accessManager))
)
);

assertEq(_getImplementationAddress(address(spokeProxy)), address(spokeImpl2));

vm.prank(proxyAdmin2);
accessManager.execute(
address(proxyAdmin),
abi.encodeWithSelector(
ProxyAdmin.upgradeAndCall.selector,
spokeProxy,
address(spokeImpl3),
_getInitializeCalldata(address(accessManager))
)
);

assertEq(_getImplementationAddress(address(spokeProxy)), address(spokeImpl3));
}

function _getInitializeCalldata(address manager) internal pure returns (bytes memory) {
return abi.encodeCall(ISpokeInstance.initialize, manager);
}
Expand Down
Loading