Merge pull request #127 from lidofinance/feature/pending-dg-state

Pending DualGovernance state
lidofinance · Sep 27, 2024 · 1ffa251 · 1ffa251
2 parents 8296824 + a3e6a8e
commit 1ffa251
Show file tree

Hide file tree

Showing 22 changed files with 2,513 additions and 364 deletions.
diff --git a/contracts/DualGovernance.sol b/contracts/DualGovernance.sol
diff --git a/contracts/EmergencyProtectedTimelock.sol b/contracts/EmergencyProtectedTimelock.sol
diff --git a/contracts/Escrow.sol b/contracts/Escrow.sol
diff --git a/contracts/TimelockedGovernance.sol b/contracts/TimelockedGovernance.sol
@@ -53,9 +53,10 @@ contract TimelockedGovernance is IGovernance {
     }
 
     /// @dev Cancels all pending proposals that have not been executed.
-    function cancelAllPendingProposals() external {
+    function cancelAllPendingProposals() external returns (bool) {
         _checkCallerIsGovernance();
         TIMELOCK.cancelAllNonExecutedProposals();
+        return true;
     }
 
     /// @dev Checks if the msg.sender is the governance address.

diff --git a/contracts/committees/EmergencyActivationCommittee.sol b/contracts/committees/EmergencyActivationCommittee.sol
@@ -6,7 +6,7 @@ import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 import {Durations} from "../types/Duration.sol";
 import {Timestamp} from "../types/Timestamp.sol";
 
-import {ITimelock} from "../interfaces/ITimelock.sol";
+import {IEmergencyProtectedTimelock} from "../interfaces/IEmergencyProtectedTimelock.sol";
 
 import {HashConsensus} from "./HashConsensus.sol";
 
@@ -54,7 +54,8 @@ contract EmergencyActivationCommittee is HashConsensus {
     function executeActivateEmergencyMode() external {
         _markUsed(EMERGENCY_ACTIVATION_HASH);
         Address.functionCall(
-            EMERGENCY_PROTECTED_TIMELOCK, abi.encodeWithSelector(ITimelock.activateEmergencyMode.selector)
+            EMERGENCY_PROTECTED_TIMELOCK,
+            abi.encodeWithSelector(IEmergencyProtectedTimelock.activateEmergencyMode.selector)
         );
     }
 }
diff --git a/contracts/committees/EmergencyExecutionCommittee.sol b/contracts/committees/EmergencyExecutionCommittee.sol
@@ -6,7 +6,7 @@ import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 import {Durations} from "../types/Duration.sol";
 import {Timestamp} from "../types/Timestamp.sol";
 
-import {ITimelock} from "../interfaces/ITimelock.sol";
+import {IEmergencyProtectedTimelock} from "../interfaces/IEmergencyProtectedTimelock.sol";
 
 import {HashConsensus} from "./HashConsensus.sol";
 import {ProposalsList} from "./ProposalsList.sol";
@@ -72,14 +72,18 @@ contract EmergencyExecutionCommittee is HashConsensus, ProposalsList {
         (, bytes32 key) = _encodeEmergencyExecute(proposalId);
         _markUsed(key);
         Address.functionCall(
-            EMERGENCY_PROTECTED_TIMELOCK, abi.encodeWithSelector(ITimelock.emergencyExecute.selector, proposalId)
+            EMERGENCY_PROTECTED_TIMELOCK,
+            abi.encodeWithSelector(IEmergencyProtectedTimelock.emergencyExecute.selector, proposalId)
         );
     }
 
     /// @notice Checks if a proposal exists
     /// @param proposalId The ID of the proposal to check
     function _checkProposalExists(uint256 proposalId) internal view {
-        if (proposalId == 0 || proposalId > ITimelock(EMERGENCY_PROTECTED_TIMELOCK).getProposalsCount()) {
+        if (
+            proposalId == 0
+                || proposalId > IEmergencyProtectedTimelock(EMERGENCY_PROTECTED_TIMELOCK).getProposalsCount()
+        ) {
             revert ProposalDoesNotExist(proposalId);
         }
     }
@@ -128,7 +132,9 @@ contract EmergencyExecutionCommittee is HashConsensus, ProposalsList {
     function executeEmergencyReset() external {
         bytes32 proposalKey = _encodeEmergencyResetProposalKey();
         _markUsed(proposalKey);
-        Address.functionCall(EMERGENCY_PROTECTED_TIMELOCK, abi.encodeWithSelector(ITimelock.emergencyReset.selector));
+        Address.functionCall(
+            EMERGENCY_PROTECTED_TIMELOCK, abi.encodeWithSelector(IEmergencyProtectedTimelock.emergencyReset.selector)
+        );
     }
 
     /// @notice Encodes the proposal key for an emergency reset

diff --git a/contracts/interfaces/IDualGovernance.sol b/contracts/interfaces/IDualGovernance.sol
@@ -9,8 +9,9 @@ import {State} from "../libraries/DualGovernanceStateMachine.sol";
 
 interface IDualGovernance is IGovernance, ITiebreaker {
     struct StateDetails {
-        State state;
-        Timestamp enteredAt;
+        State effectiveState;
+        State persistedState;
+        Timestamp persistedStateEnteredAt;
         Timestamp vetoSignallingActivatedAt;
         Timestamp vetoSignallingReactivationTime;
         Timestamp normalOrVetoCooldownExitedAt;

diff --git a/contracts/interfaces/IEmergencyProtectedTimelock.sol b/contracts/interfaces/IEmergencyProtectedTimelock.sol
@@ -12,6 +12,9 @@ interface IEmergencyProtectedTimelock is ITimelock {
         Timestamp emergencyProtectionEndsAfter;
     }
 
+    function activateEmergencyMode() external;
+    function emergencyExecute(uint256 proposalId) external;
+    function emergencyReset() external;
     function getEmergencyGovernance() external view returns (address emergencyGovernance);
     function getEmergencyActivationCommittee() external view returns (address committee);
     function getEmergencyExecutionCommittee() external view returns (address committee);

diff --git a/contracts/interfaces/IGovernance.sol b/contracts/interfaces/IGovernance.sol
@@ -12,7 +12,7 @@ interface IGovernance {
         string calldata metadata
     ) external returns (uint256 proposalId);
     function scheduleProposal(uint256 proposalId) external;
-    function cancelAllPendingProposals() external;
+    function cancelAllPendingProposals() external returns (bool);
 
     function canScheduleProposal(uint256 proposalId) external view returns (bool);
 }
diff --git a/contracts/interfaces/ITimelock.sol b/contracts/interfaces/ITimelock.sol
@@ -28,18 +28,13 @@ interface ITimelock {
     function canExecute(uint256 proposalId) external view returns (bool);
 
     function getAdminExecutor() external view returns (address);
+    function getGovernance() external view returns (address);
+    function setGovernance(address governance) external;
 
     function getProposal(uint256 proposalId)
         external
         view
         returns (ProposalDetails memory proposal, ExternalCall[] memory calls);
     function getProposalDetails(uint256 proposalId) external view returns (ProposalDetails memory proposalDetails);
-
-    function getGovernance() external view returns (address);
-    function setGovernance(address governance) external;
-
-    function activateEmergencyMode() external;
-    function emergencyExecute(uint256 proposalId) external;
-    function emergencyReset() external;
     function getProposalsCount() external view returns (uint256 count);
 }