Skip to content

Commit

Permalink
Fix submissionTime and comment out activateNextState()
Browse files Browse the repository at this point in the history
  • Loading branch information
qian-hu committed Jul 8, 2024
1 parent 9e0f326 commit aab4073
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions contracts/model/DualGovernanceModel.sol
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ contract DualGovernanceModel {
* Proposals can be submitted when in the Normal state or during Veto Signalling; however they cannot be executed in Veto Signalling.
*/
function submitProposal(ExecutorCall[] calldata calls) external returns (uint256 proposalId) {
activateNextState();
// activateNextState();

require(proposers[msg.sender], "Caller is not authorized to submit proposals.");
require(calls.length != 0, "Empty calls.");
Expand All @@ -80,14 +80,14 @@ contract DualGovernanceModel {
* Scheduling is allowed in Normal and Veto Cooldown states to prepare proposals for decision-making.
*/
function scheduleProposal(uint256 proposalId) external {
activateNextState();
// activateNextState();

require(
currentState == State.Normal || currentState == State.VetoCooldown,
"Proposals can only be scheduled in Normal or Veto Cooldown states."
);
if (currentState == State.VetoCooldown) {
(,,, uint256 submissionTime,) = emergencyProtectedTimelock.proposals(proposalId);
(,, uint256 submissionTime,,) = emergencyProtectedTimelock.proposals(proposalId);
require(
submissionTime < lastVetoSignallingTime,
"Proposal submitted after the last time Veto Signalling state was entered."
Expand All @@ -99,7 +99,7 @@ contract DualGovernanceModel {

// Cancel all non-executed proposals.
function cancelAllPendingProposals() external {
activateNextState();
// activateNextState();

require(admin_proposers[msg.sender], "Caller is not admin proposers.");
require(
Expand Down

0 comments on commit aab4073

Please sign in to comment.