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

gave the dao full permissions during setup and added tests #11

Closed
wants to merge 1 commit into from
Closed

gave the dao full permissions during setup and added tests #11

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
27 changes: 25 additions & 2 deletions src/voting/SimpleGaugeVoterSetup.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ contract SimpleGaugeVoterSetup is PluginSetup {
PermissionLib.Operation _grantOrRevoke
) public view returns (PermissionLib.MultiTargetPermission[] memory) {
PermissionLib.MultiTargetPermission[]
memory permissions = new PermissionLib.MultiTargetPermission[](7);
memory permissions = new PermissionLib.MultiTargetPermission[](10);

permissions[0] = PermissionLib.MultiTargetPermission({
permissionId: SimpleGaugeVoter(_plugin).GAUGE_ADMIN_ROLE(),
Expand Down Expand Up @@ -258,7 +258,7 @@ contract SimpleGaugeVoterSetup is PluginSetup {

permissions[4] = PermissionLib.MultiTargetPermission({
permissionId: SimpleGaugeVoter(_plugin).UPGRADE_PLUGIN_PERMISSION_ID(),
where: _curve,
where: _plugin,
who: _dao,
operation: _grantOrRevoke,
condition: PermissionLib.NO_CONDITION
Expand All @@ -280,6 +280,29 @@ contract SimpleGaugeVoterSetup is PluginSetup {
condition: PermissionLib.NO_CONDITION
});

permissions[7] = PermissionLib.MultiTargetPermission({
permissionId: VotingEscrow(_escrow).PAUSER_ROLE(),
where: _escrow,
who: _dao,
operation: _grantOrRevoke,
condition: PermissionLib.NO_CONDITION
});

permissions[8] = PermissionLib.MultiTargetPermission({
permissionId: VotingEscrow(_escrow).SWEEPER_ROLE(),
where: _escrow,
who: _dao,
operation: _grantOrRevoke,
condition: PermissionLib.NO_CONDITION
});

permissions[9] = PermissionLib.MultiTargetPermission({
permissionId: ExitQueue(_queue).WITHDRAW_ROLE(),
where: _queue,
who: _dao,
operation: _grantOrRevoke,
condition: PermissionLib.NO_CONDITION
});
return permissions;
}

Expand Down
112 changes: 50 additions & 62 deletions test/voting/Setup.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,83 +26,71 @@ import {IPluginSetup} from "@aragon/osx/framework/plugin/setup/IPluginSetup.sol"
contract VoterSetupTest is GaugeVotingBase {
error WrongHelpersArrayLength(uint256 length);

function testUninstall() public {
address[] memory currentHelpers = new address[](5);
currentHelpers[0] = address(curve);
currentHelpers[1] = address(queue);
currentHelpers[2] = address(escrow);
currentHelpers[3] = address(clock);
currentHelpers[4] = address(nftLock);
function testInstallAndUninstall() public {
// Verify permissions have been granted
assertTrue(dao.hasPermission(address(voter), address(dao), voter.GAUGE_ADMIN_ROLE(), ""));
assertTrue(
dao.hasPermission(address(escrow), address(dao), escrow.ESCROW_ADMIN_ROLE(), "")
);
assertTrue(dao.hasPermission(address(queue), address(dao), queue.QUEUE_ADMIN_ROLE(), ""));
assertTrue(dao.hasPermission(address(curve), address(dao), curve.CURVE_ADMIN_ROLE(), ""));
assertTrue(
dao.hasPermission(
address(voter),
address(dao),
voter.UPGRADE_PLUGIN_PERMISSION_ID(),
""
)
);
assertTrue(dao.hasPermission(address(clock), address(dao), clock.CLOCK_ADMIN_ROLE(), ""));
assertTrue(
dao.hasPermission(address(nftLock), address(dao), nftLock.LOCK_ADMIN_ROLE(), "")
);
assertTrue(dao.hasPermission(address(escrow), address(dao), escrow.PAUSER_ROLE(), ""));
assertTrue(dao.hasPermission(address(escrow), address(dao), escrow.SWEEPER_ROLE(), ""));
assertTrue(dao.hasPermission(address(queue), address(dao), queue.WITHDRAW_ROLE(), ""));

// Prepare uninstallation and revoke permissions
IPluginSetup.SetupPayload memory payload = IPluginSetup.SetupPayload({
plugin: address(voter),
currentHelpers: currentHelpers,
currentHelpers: new address[](5),
data: bytes("")
});

PermissionLib.MultiTargetPermission[] memory permissions = voterSetup.prepareUninstallation(
address(dao),
payload
);

vm.prank(address(dao));
dao.applyMultiTargetPermissions(permissions);

// dao should now not be admin of the plugins
payload.currentHelpers[0] = address(curve);
payload.currentHelpers[1] = address(queue);
payload.currentHelpers[2] = address(escrow);
payload.currentHelpers[3] = address(clock);
payload.currentHelpers[4] = address(nftLock);

assertFalse(
dao.hasPermission({
_who: address(dao),
_where: address(voter),
_permissionId: voter.GAUGE_ADMIN_ROLE(),
_data: ""
})
);

assertFalse(
dao.hasPermission({
_who: address(dao),
_where: address(curve),
_permissionId: curve.CURVE_ADMIN_ROLE(),
_data: ""
})
);
PermissionLib.MultiTargetPermission[] memory revokePermissions = voterSetup
.prepareUninstallation(address(dao), payload);

assertFalse(
dao.hasPermission({
_who: address(dao),
_where: address(queue),
_permissionId: queue.QUEUE_ADMIN_ROLE(),
_data: ""
})
);
vm.prank(address(dao));
dao.applyMultiTargetPermissions(revokePermissions);

// Verify permissions have been revoked
assertFalse(dao.hasPermission(address(voter), address(dao), voter.GAUGE_ADMIN_ROLE(), ""));
assertFalse(
dao.hasPermission({
_who: address(escrow),
_where: address(dao),
_permissionId: escrow.ESCROW_ADMIN_ROLE(),
_data: ""
})
dao.hasPermission(address(escrow), address(dao), escrow.ESCROW_ADMIN_ROLE(), "")
);

assertFalse(dao.hasPermission(address(queue), address(dao), queue.QUEUE_ADMIN_ROLE(), ""));
assertFalse(dao.hasPermission(address(curve), address(dao), curve.CURVE_ADMIN_ROLE(), ""));
assertFalse(
dao.hasPermission({
_who: address(voter),
_where: address(dao),
_permissionId: voter.UPGRADE_PLUGIN_PERMISSION_ID(),
_data: ""
})
dao.hasPermission(
address(voter),
address(dao),
voter.UPGRADE_PLUGIN_PERMISSION_ID(),
""
)
);

assertFalse(dao.hasPermission(address(clock), address(dao), clock.CLOCK_ADMIN_ROLE(), ""));
assertFalse(
dao.hasPermission({
_who: address(nftLock),
_where: address(dao),
_permissionId: nftLock.LOCK_ADMIN_ROLE(),
_data: ""
})
dao.hasPermission(address(nftLock), address(dao), nftLock.LOCK_ADMIN_ROLE(), "")
);
assertFalse(dao.hasPermission(address(escrow), address(dao), escrow.PAUSER_ROLE(), ""));
assertFalse(dao.hasPermission(address(escrow), address(dao), escrow.SWEEPER_ROLE(), ""));
assertFalse(dao.hasPermission(address(queue), address(dao), queue.WITHDRAW_ROLE(), ""));
}

function testCantPassIncorrectHelpers() public {
Expand Down
Loading