feat: add update default pod controller method

thomas-waite · thomas-waite · commit aa2dcd5a6e12 · 2022-04-26T01:02:34.000+02:00
diff --git a/contracts/pods/PodFactory.sol b/contracts/pods/PodFactory.sol
@@ -27,7 +27,7 @@ contract PodFactory is CoreRef, IPodFactory {
     PodExecutor public immutable podExecutor;
 
     /// @notice Constant podController used to create pods
-    ControllerV1 public immutable defaultPodController;
+    ControllerV1 public override defaultPodController;
 
     /// @notice Mapping between podId and it's timelock
     mapping(uint256 => address) public override getPodTimelock;
@@ -87,10 +87,7 @@ contract PodFactory is CoreRef, IPodFactory {
         override
         returns (ControllerV1)
     {
-        ControllerV1 podController = ControllerV1(
-            memberToken.memberController(podId)
-        );
-        return podController;
+        return ControllerV1(memberToken.memberController(podId));
     }
 
     /// @notice Get the address of the Gnosis safe that represents a pod
@@ -215,6 +212,20 @@ contract PodFactory is CoreRef, IPodFactory {
         return (podId, timelock, safe);
     }
 
+    /// @notice Update the default pod controller
+    function updateDefaultPodController(address _newDefaultController)
+        external
+        override
+        hasAnyOfTwoRoles(TribeRoles.GOVERNOR, TribeRoles.POD_ADMIN)
+    {
+        address oldDefaultController = address(defaultPodController);
+        defaultPodController = ControllerV1(_newDefaultController);
+        emit UpdateDefaultPodController(
+            oldDefaultController,
+            _newDefaultController
+        );
+    }
+
     ////////////////////////     INTERNAL          ////////////////////////////
 
     /// @notice Internal method to create a child optimistic pod
diff --git a/contracts/pods/interfaces/IPodFactory.sol b/contracts/pods/interfaces/IPodFactory.sol
@@ -33,6 +33,11 @@ interface IPodFactory {
         address indexed newController
     );
 
+    event UpdateDefaultPodController(
+        address indexed oldController,
+        address indexed newController
+    );
+
     function deployCouncilPod(PodConfig calldata _config)
         external
         returns (
@@ -41,6 +46,8 @@ interface IPodFactory {
             address
         );
 
+    function defaultPodController() external view returns (ControllerV1);
+
     function getMemberToken() external view returns (MemberToken);
 
     function getPodSafeAddresses() external view returns (address[] memory);
@@ -81,4 +88,6 @@ interface IPodFactory {
             address,
             address
         );
+
+    function updateDefaultPodController(address _newDefaultController) external;
 }
diff --git a/contracts/test/integration/fixtures/MainnetAddresses.sol b/contracts/test/integration/fixtures/MainnetAddresses.sol
@@ -8,6 +8,8 @@ library MainnetAddresses {
     address public constant TRIBE = 0xc7283b66Eb1EB5FB86327f08e1B5816b0720212B;
     address public constant MEMBER_TOKEN =
         0x0762aA185b6ed2dCA77945Ebe92De705e0C37AE3;
-    address public constant POD_CONTROLLER =
+    address public constant ORCA_POD_CONTROLLER_V1 =
+        0xD89AAd5348A34E440E72f5F596De4fA7e291A3e8;
+    address public constant ORCA_POD_CONTROLLER_V1_2 =
         0x17FDC2Eaf2bd46f3e1052CCbccD9e6AD0296C42c;
 }
diff --git a/contracts/test/integration/governance/NopeDAO.t.sol b/contracts/test/integration/governance/NopeDAO.t.sol
@@ -62,7 +62,7 @@ contract NopeDAOIntegrationTest is DSTest {
             podConfig
         ) = deployPodWithSystem(
             MainnetAddresses.CORE,
-            MainnetAddresses.POD_CONTROLLER,
+            MainnetAddresses.ORCA_POD_CONTROLLER_V1_2,
             MainnetAddresses.MEMBER_TOKEN,
             podExecutor,
             MainnetAddresses.FEI_DAO_TIMELOCK,
diff --git a/contracts/test/integration/governance/OptimisticPodTest.t.sol b/contracts/test/integration/governance/OptimisticPodTest.t.sol
@@ -22,7 +22,8 @@ contract OptimisticPodIntegrationTest is DSTest {
 
     MemberToken memberToken = MemberToken(MainnetAddresses.MEMBER_TOKEN);
 
-    ControllerV1 controller = ControllerV1(MainnetAddresses.POD_CONTROLLER);
+    ControllerV1 controller =
+        ControllerV1(MainnetAddresses.ORCA_POD_CONTROLLER_V1_2);
 
     address proposer = address(0x1);
     address executor = address(0x2);
diff --git a/contracts/test/integration/governance/PodAdminGateway.t.sol b/contracts/test/integration/governance/PodAdminGateway.t.sol
@@ -29,7 +29,7 @@ contract PodAdminGatewayIntegrationTest is DSTest {
 
     address core = MainnetAddresses.CORE;
     address memberToken = MainnetAddresses.MEMBER_TOKEN;
-    address podController = MainnetAddresses.POD_CONTROLLER;
+    address podController = MainnetAddresses.ORCA_POD_CONTROLLER_V1_2;
     address feiDAOTimelock = MainnetAddresses.FEI_DAO_TIMELOCK;
 
     function setUp() public {
diff --git a/contracts/test/integration/governance/PodFactory.t.sol b/contracts/test/integration/governance/PodFactory.t.sol
@@ -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 {IGnosisSafe} from "../../../pods/interfaces/IGnosisSafe.sol";
 import {PodFactory} from "../../../pods/PodFactory.sol";
 import {PodExecutor} from "../../../pods/PodExecutor.sol";
@@ -31,7 +32,7 @@ contract PodFactoryIntegrationTest is DSTest {
 
     address core = MainnetAddresses.CORE;
     address memberToken = MainnetAddresses.MEMBER_TOKEN;
-    address podController = MainnetAddresses.POD_CONTROLLER;
+    address podController = MainnetAddresses.ORCA_POD_CONTROLLER_V1_2;
     address feiDAOTimelock = MainnetAddresses.FEI_DAO_TIMELOCK;
 
     function setUp() public {
@@ -69,6 +70,7 @@ contract PodFactoryIntegrationTest is DSTest {
         assertEq(address(factory.podExecutor()), address(podExecutor));
         assertEq(address(factory.getMemberToken()), memberToken);
         assertEq(factory.MIN_TIMELOCK_DELAY(), 1 days);
+        assertEq(address(factory.defaultPodController()), podController);
 
         address[] memory podSafeAddresses = factory.getPodSafeAddresses();
         assertEq(podSafeAddresses.length, 0);
@@ -406,4 +408,63 @@ contract PodFactoryIntegrationTest is DSTest {
         assertTrue(timelockContract.isOperationDone(txHash));
         assertEq(dummyContract.getVariable(), newDummyContractVar);
     }
+
+    /// @notice Validate that the default pod controller can be updated
+    function testUpdateDefaultPodController() public {
+        address newDefaultPodController = address(0x123);
+        vm.prank(feiDAOTimelock);
+        factory.updateDefaultPodController(newDefaultPodController);
+        assertEq(
+            address(factory.defaultPodController()),
+            newDefaultPodController
+        );
+    }
+
+    /// @notice Validate that a pod controller can be updated and that will be reflected
+    ///         on the pod factory
+    function testPodControllerUpdate() public {
+        IPodFactory.PodConfig memory podConfig = getPodParamsWithTimelock(
+            podAdmin
+        );
+
+        // Set default to old version, to create pod with old controller
+        vm.prank(feiDAOTimelock);
+        factory.updateDefaultPodController(
+            MainnetAddresses.ORCA_POD_CONTROLLER_V1
+        );
+        assertEq(
+            address(factory.defaultPodController()),
+            MainnetAddresses.ORCA_POD_CONTROLLER_V1
+        );
+
+        vm.prank(feiDAOTimelock);
+        (uint256 podId, address timelock, address safe) = factory
+            .deployCouncilPod(podConfig);
+
+        // 1. Get pod controller
+        address defaultPodController = address(factory.defaultPodController());
+        address initialPodController = address(factory.getPodController(podId));
+        assertEq(defaultPodController, initialPodController);
+
+        // 2. Pod migrates it's own pod controller to another minor version
+        vm.prank(safe);
+        ControllerV1(initialPodController).migratePodController(
+            podId,
+            MainnetAddresses.ORCA_POD_CONTROLLER_V1_2,
+            MainnetAddresses.ORCA_POD_CONTROLLER_V1_2
+        );
+
+        // 3. Verify pod's controller was updated on the memberToken and factory
+        address newPodControllerOnFactory = address(
+            factory.getPodController(podId)
+        );
+        address expectedNewPodController = MemberToken(memberToken)
+            .memberController(podId);
+
+        assertEq(expectedNewPodController, newPodControllerOnFactory);
+        assertEq(
+            newPodControllerOnFactory,
+            MainnetAddresses.ORCA_POD_CONTROLLER_V1_2
+        );
+    }
 }
