One day delay before voting (#430)

OriginProtocol · May 27, 2024 · a532415 · a532415
1 parent b4b5aa4
commit a532415
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/contracts/Governance.sol b/contracts/Governance.sol
@@ -17,7 +17,11 @@ contract Governance is
 {
     constructor(ERC20Votes _token, TimelockController _timelock)
         Governor("Origin DeFi Governance")
-        GovernorSettings(1, /* 1 block */ 14416, /* ~2 days (86400 / 12) * 2 */ 100000 * 1e18 /* 100k xOGN */ )
+        GovernorSettings(
+            7200, /* ~1 day (86400 / 12) */
+            14416, /* ~2 days (86400 / 12) * 2 */
+            100000 * 1e18 /* 100k xOGN */
+        )
         GovernorVotes(_token)
         GovernorVotesQuorumFraction(20) // Default quorum denominator is 100, so 20/100 or 20%
         GovernorTimelockControl(_timelock)

diff --git a/tests/governance/XOGNGovernanceForkTest.t.sol b/tests/governance/XOGNGovernanceForkTest.t.sol
@@ -68,7 +68,7 @@ contract XOGNGovernanceForkTest is Test {
     }
 
     function testVotingDelay() external view {
-        assertEq(xognGov.votingDelay(), 1, "Incorrect voting delay");
+        assertEq(xognGov.votingDelay(), 7200, "Incorrect voting delay");
     }
 
     function testVotingPeriod() external view {
@@ -201,8 +201,8 @@ contract XOGNGovernanceForkTest is Test {
         assertEq(uint256(xognGov.state(proposalId)), 0, "Proposal wasn't created");
 
         // Wait for voting to start
-        vm.warp(block.timestamp + 10 minutes);
-        vm.roll(block.number + 100);
+        vm.warp(block.timestamp + 1 days);
+        vm.roll(block.number + 7300);
         assertEq(uint256(xognGov.state(proposalId)), 1, "Proposal isn't active");
 
         // Vote on proposal
@@ -258,8 +258,8 @@ contract XOGNGovernanceForkTest is Test {
         assertEq(uint256(xognGov.state(proposalId)), 0, "Proposal wasn't created");
 
         // Wait for voting to start
-        vm.warp(block.timestamp + 10 minutes);
-        vm.roll(block.number + 100);
+        vm.warp(block.timestamp + 1 days);
+        vm.roll(block.number + 7300);
         assertEq(uint256(xognGov.state(proposalId)), 1, "Proposal isn't active");
 
         // Vote on proposal