feat: update governance delay time in contracts

Threshold-USD · May 8, 2024 · 35bd6b0 · 35bd6b0
1 parent 5c3fac0
commit 35bd6b0
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 16 deletions.
diff --git a/packages/contracts/contracts/Interfaces/ITHUSDToken.sol b/packages/contracts/contracts/Interfaces/ITHUSDToken.sol
@@ -13,6 +13,8 @@ interface ITHUSDToken is IERC20Metadata, IERC2612 {
     event StabilityPoolAddressAdded(address _newStabilityPoolAddress);
     event BorrowerOperationsAddressAdded(address _newBorrowerOperationsAddress);
 
+    event GovernanceTimeDelayIncreased(uint256 _newGovernanceTimeDelay);
+
     event THUSDTokenBalanceUpdated(address _user, uint256 _amount);
 
     // --- External Functions ---
@@ -27,6 +29,9 @@ interface ITHUSDToken is IERC20Metadata, IERC2612 {
 
     function decreaseAllowance(address spender, uint256 subtractedValue) external returns (bool);
 
+    // --- Getters Functions ---
+    function getGovernanceTimeDelay() external view returns (uint256);
+
     // --- Governance functions ---
     function startRevokeMintList(address _account) external;
     function finalizeRevokeMintList() external;

diff --git a/packages/contracts/contracts/PCV.sol b/packages/contracts/contracts/PCV.sol
@@ -18,7 +18,7 @@ contract PCV is IPCV, Ownable, CheckContract, SendCollateral {
 
     uint256 constant public BOOTSTRAP_LOAN = 1e26; // 100M thUSD
 
-    uint256 public immutable governanceTimeDelay;
+    uint256 public governanceTimeDelay;
 
     ITHUSDToken public thusdToken;
     BorrowerOperations public borrowerOperations;
@@ -38,10 +38,6 @@ contract PCV is IPCV, Ownable, CheckContract, SendCollateral {
     address public pendingTreasuryAddress;
     uint256 public changingRolesInitiated;
 
-    constructor(uint256 _governanceTimeDelay) {
-        governanceTimeDelay = _governanceTimeDelay;
-    }
-
     modifier onlyAfterDebtPaid() {
         require(isInitialized && debtToPay == 0, "PCV: debt must be paid");
         _;
@@ -179,6 +175,8 @@ contract PCV is IPCV, Ownable, CheckContract, SendCollateral {
         require(_council != council || _treasury != treasury, "PCV: these roles already set");
 
         changingRolesInitiated = block.timestamp;
+        governanceTimeDelay = thusdToken.getGovernanceTimeDelay();
+
         if (council == address(0) && treasury == address(0)) {
             changingRolesInitiated -= governanceTimeDelay; // skip delay if no roles set
         }
@@ -195,6 +193,8 @@ contract PCV is IPCV, Ownable, CheckContract, SendCollateral {
     }
 
     function finalizeChangingRoles() external override onlyOwner {
+        governanceTimeDelay = thusdToken.getGovernanceTimeDelay();
+
         require(changingRolesInitiated > 0, "PCV: Change not initiated");
         require(
             block.timestamp >= changingRolesInitiated + governanceTimeDelay,

diff --git a/packages/contracts/contracts/THUSDToken.sol b/packages/contracts/contracts/THUSDToken.sol
@@ -56,7 +56,7 @@ contract THUSDToken is Ownable, CheckContract, ITHUSDToken {
     mapping(address => bool) public burnList;
     mapping(address => bool) public mintList;
 
-    uint256 public immutable governanceTimeDelay;
+    uint256 public governanceTimeDelay;
 
     address public pendingTroveManager;
     address public pendingStabilityPool;
@@ -78,8 +78,7 @@ contract THUSDToken is Ownable, CheckContract, ITHUSDToken {
         address _borrowerOperationsAddress1,
         address _troveManagerAddress2,
         address _stabilityPoolAddress2,
-        address _borrowerOperationsAddress2,
-        uint256 _governanceTimeDelay
+        address _borrowerOperationsAddress2
     )
     {
         // when created its linked to one set of contracts and collateral, other collateral types can be added via governance
@@ -94,8 +93,6 @@ contract THUSDToken is Ownable, CheckContract, ITHUSDToken {
         _HASHED_VERSION = hashedVersion;
         _CACHED_CHAIN_ID = block.chainid;
         _CACHED_DOMAIN_SEPARATOR = _buildDomainSeparator(_TYPE_HASH, hashedName, hashedVersion);
-        governanceTimeDelay = _governanceTimeDelay;
-        require(governanceTimeDelay <= 30 weeks, "Governance delay is too big");
     }
 
     modifier onlyAfterGovernanceDelay(
@@ -109,6 +106,22 @@ contract THUSDToken is Ownable, CheckContract, ITHUSDToken {
         _;
     }
 
+    function increaseGovernanceTimeDelay(
+        uint256 _governanceTimeDelay
+    )
+        external
+        onlyOwner
+    {
+        require(
+            _governanceTimeDelay >= governanceTimeDelay,
+            "The governance time delay can only be increased"
+        );
+        require(_governanceTimeDelay <= 30 weeks, "Governance delay is too big");
+
+        governanceTimeDelay = _governanceTimeDelay;
+        emit GovernanceTimeDelayIncreased(_governanceTimeDelay);
+    }
+
     // --- Governance ---
 
     function startRevokeMintList(address _account)
@@ -240,6 +253,12 @@ contract THUSDToken is Ownable, CheckContract, ITHUSDToken {
         _burn(_account, _amount);
     }
 
+    // --- thUSD property getters ---
+
+    function getGovernanceTimeDelay() external view override returns (uint256) {
+        return governanceTimeDelay;
+    }
+
     // --- External functions ---
 
     function totalSupply() external view override returns (uint256) {

diff --git a/packages/contracts/contracts/TestContracts/EchidnaTester.sol b/packages/contracts/contracts/TestContracts/EchidnaTester.sol
@@ -55,8 +55,7 @@ contract EchidnaTester {
             address(borrowerOperations),
             address(0),
             address(0),
-            address(0),
-            90 * 24 * 60 * 60
+            address(0)
         );
 
         collSurplusPool = new CollSurplusPool();

diff --git a/packages/contracts/contracts/TestContracts/THUSDTokenTester.sol b/packages/contracts/contracts/TestContracts/THUSDTokenTester.sol
@@ -11,16 +11,14 @@ contract THUSDTokenTester is THUSDToken {
     constructor(
         address _troveManagerAddress,
         address _stabilityPoolAddress,
-        address _borrowerOperationsAddress,
-        uint256 _governanceTimeDelay
+        address _borrowerOperationsAddress
     ) 
         THUSDToken(_troveManagerAddress,
                  _stabilityPoolAddress,
                  _borrowerOperationsAddress,
                  address(0),
                  address(0),
-                 address(0),
-                 _governanceTimeDelay
+                 address(0)
     ) {}
 
     function unprotectedMint(address _account, uint256 _amount) external {