Skip to content

Add a transfer pod admin function to the gateway #755

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

Merged
thomas-waite merged 3 commits into from
Apr 28, 2022
Merged

Add a transfer pod admin function to the gateway #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76ebcae
feat: add transfer pod admin functionality
thomas-waite Apr 28, 2022
8703405
feat: add transfer admin functionality
thomas-waite Apr 28, 2022
e8359dc
test: make transfer admin test more extensive
thomas-waite Apr 28, 2022
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
13 changes: 13 additions & 0 deletions contracts/pods/PodAdminGateway.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,19 @@ contract PodAdminGateway is CoreRef, IPodAdminGateway {
emit PodMembershipTransferLock(_podId, _lock);
}

/// @notice Transfer the admin of a pod to a new address
/// @dev Permissioned to GOVERNOR, POD_ADMIN and the specific pod admin role
function transferAdmin(uint256 _podId, address _newAdmin)
external
hasAnyOfThreeRoles(TribeRoles.GOVERNOR, TribeRoles.POD_ADMIN, getSpecificPodAdminRole(_podId))
{
ControllerV1 podController = ControllerV1(memberToken.memberController(_podId));
address oldPodAdmin = podController.podAdmin(_podId);

podController.updatePodAdmin(_podId, _newAdmin);
emit UpdatePodAdmin(_podId, oldPodAdmin, _newAdmin);
}

/////////////// VETO CONTROLLER /////////////////

/// @notice Allow a proposal to be vetoed in a pod timelock
Expand Down
27 changes: 27 additions & 0 deletions contracts/test/integration/governance/PodAdminGateway.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ pragma solidity ^0.8.0;

import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";
import {ControllerV1} from "@orcaprotocol/contracts/contracts/ControllerV1.sol";
import {MemberToken} from "@orcaprotocol/contracts/contracts/MemberToken.sol";
import {Vm} from "../../utils/Vm.sol";
import {DSTest} from "../../utils/DSTest.sol";
import {PodFactory} from "../../../pods/PodFactory.sol";
Expand Down Expand Up @@ -149,6 +150,32 @@ contract PodAdminGatewayIntegrationTest is DSTest {
assertFalse(memberTransfersLocked);
}

/// @notice Transfer pod admin to new admin
function testTransferPodAdmin() public {
address memberToRemove = podConfig.members[0];
address newAdmin = address(0x22);

vm.prank(feiDAOTimelock);
podAdminGateway.transferAdmin(podId, newAdmin);

address newAdminOnFactory = factory.getPodAdmin(podId);
assertEq(newAdminOnFactory, newAdmin);

address newAdminOnController = ControllerV1(podController).podAdmin(podId);
assertEq(newAdminOnController, newAdmin);

// Validate new pod admin can perform an admin function, such as removing a member
vm.prank(newAdmin);
MemberToken(memberToken).burn(memberToRemove, podId);

uint256 numPodMembers = factory.getNumMembers(podId);
assertEq(numPodMembers, podConfig.members.length - 1);

address[] memory podMembers = factory.getPodMembers(podId);
assertEq(podMembers[0], podConfig.members[1]);
assertEq(podMembers[1], podConfig.members[2]);
}

/// @notice Validate that a non-PodAdmin fails to call a priviledged admin method
function testNonAdminFailsToRemoveMember() public {
vm.expectRevert(bytes("UNAUTHORIZED"));
Expand Down