diff --git a/script/L2Governor.s.sol b/script/L2Governor.s.sol index 3033463d..9a9dd7e6 100644 --- a/script/L2Governor.s.sol +++ b/script/L2Governor.s.sol @@ -77,7 +77,7 @@ contract L2GovernorScript is Script { L2Governor l2Governor = L2Governor(payable(address(l2GovernorProxy))); assert(keccak256(bytes(l2Governor.name())) == keccak256(bytes("Lisk Governor"))); assert(l2Governor.votingDelay() == 0); - assert(l2Governor.votingPeriod() == 50400); + assert(l2Governor.votingPeriod() == 604800); assert(l2Governor.proposalThreshold() == 2e18); assert(l2Governor.timelock() == address(timelock)); assert(address(l2Governor.token()) == address(votingPower)); diff --git a/src/L2/L2Governor.sol b/src/L2/L2Governor.sol index 87c6642d..4c2d1e2b 100644 --- a/src/L2/L2Governor.sol +++ b/src/L2/L2Governor.sol @@ -35,13 +35,13 @@ contract L2Governor is uint48 public constant VOTING_DELAY = 0; /// @notice Voting period for proposals (in EIP-6372 clock). - uint32 public constant VOTING_PERIOD = 50400; // 7 days + uint32 public constant VOTING_PERIOD = 604800; // 7 days /// @notice Threshold for a proposal to be successful. - uint256 public constant PROPOSAL_THRESHOLD = 2e18; + uint256 public constant PROPOSAL_THRESHOLD = 2e18; // TODO change this value once we have a proper threshold /// @notice Quorum required for a proposal to be successful (number of tokens). - uint256 public constant QUORUM_THRESHOLD = 50000e18; + uint256 public constant QUORUM_THRESHOLD = 50000e18; // TODO change this value once we have a proper threshold /// @notice Disabling initializers on implementation contract to prevent misuse. constructor() { @@ -74,10 +74,7 @@ contract L2Governor is } /// @notice Returns the quorum required for a proposal to be successful. - function quorum(uint256 blockNumber) public pure override returns (uint256) { - // blockNumber is not used in the calculation, but it is a required parameter. - blockNumber; - + function quorum(uint256) public pure override returns (uint256) { return QUORUM_THRESHOLD; } diff --git a/test/L2/L2Governor.t.sol b/test/L2/L2Governor.t.sol index ed2a99ff..2112ba05 100644 --- a/test/L2/L2Governor.t.sol +++ b/test/L2/L2Governor.t.sol @@ -64,7 +64,7 @@ contract L2GovernorTest is Test { assertEq(l2Governor.name(), "Lisk Governor"); assertEq(l2Governor.version(), "1.0.0"); assertEq(l2Governor.votingDelay(), 0); - assertEq(l2Governor.votingPeriod(), 50400); + assertEq(l2Governor.votingPeriod(), 604800); assertEq(l2Governor.proposalThreshold(), 2e18); assertEq(l2Governor.timelock(), address(timelock)); assertEq(address(l2Governor.token()), address(votingPower));