Skip to content

fix: voting window to use timestamp #442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0xOneTony merged 3 commits into from
Jul 7, 2025
Merged

fix: voting window to use timestamp #442

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4648478
fix: voting window to use timestamp
0xOneTony Jul 7, 2025
6202de4
fix: pre-pr
0xOneTony Jul 7, 2025
67a33c1
fix: improve test
0xOneTony Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/contracts-bedrock/interfaces/governance/IProposalValidator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ interface IProposalValidator is ISemver {

event VotingCycleDataSet(
uint256 cycleNumber,
uint256 startBlock,
uint256 startingTimestamp,
uint256 duration,
uint256 votingCycleDistributionLimit
);
Expand Down Expand Up @@ -88,7 +88,7 @@ interface IProposalValidator is ISemver {
}

struct VotingCycleData {
uint256 startingBlock;
uint256 startingTimestamp;
uint256 duration;
uint256 votingCycleDistributionLimit;
uint256 movedToVoteTokenCount;
Expand Down Expand Up @@ -154,7 +154,7 @@ interface IProposalValidator is ISemver {

function setVotingCycleData(
uint256 _cycleNumber,
uint256 _startBlock,
uint256 _startingTimestamp,
uint256 _duration,
uint256 _votingCycleDistributionLimit
) external;
Expand All @@ -170,7 +170,7 @@ interface IProposalValidator is ISemver {
address _owner,
IProposalTypesConfigurator _proposalTypesConfigurator,
uint256 _cycleNumber,
uint256 _startBlock,
uint256 _startingTimestamp,
uint256 _duration,
uint256 _votingCycleDistributionLimit,
uint256 _distributionThreshold,
Expand Down Expand Up @@ -203,7 +203,7 @@ interface IProposalValidator is ISemver {
function proposalTypesData(ProposalType) external view returns (uint256 requiredApprovals, uint8 proposalVotingModule);

function votingCycles(uint256) external view returns (
uint256 startingBlock,
uint256 startingTimestamp,
uint256 duration,
uint256 votingCycleDistributionLimit,
uint256 movedToVoteTokenCount
Expand Down
18 changes: 14 additions & 4 deletions packages/contracts-bedrock/snapshots/abi/ProposalValidator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
},
{
"internalType": "uint256",
"name": "_startBlock",
"name": "_startingTimestamp",
"type": "uint256"
},
{
Expand Down Expand Up @@ -429,7 +429,7 @@
},
{
"internalType": "uint256",
"name": "_startBlock",
"name": "_startingTimestamp",
"type": "uint256"
},
{
Expand Down Expand Up @@ -613,7 +613,7 @@
"outputs": [
{
"internalType": "uint256",
"name": "startingBlock",
"name": "startingTimestamp",
"type": "uint256"
},
{
Expand Down Expand Up @@ -805,7 +805,7 @@
{
"indexed": false,
"internalType": "uint256",
"name": "startBlock",
"name": "startingTimestamp",
"type": "uint256"
},
{
Expand Down Expand Up @@ -869,6 +869,16 @@
"name": "ProposalValidator_InvalidOptionsLength",
"type": "error"
},
{
"inputs": [],
"name": "ProposalValidator_InvalidProposal",
"type": "error"
},
{
"inputs": [],
"name": "ProposalValidator_InvalidProposer",
"type": "error"
},
{
"inputs": [],
"name": "ProposalValidator_InvalidUpgradeProposalType",
Expand Down
51 changes: 27 additions & 24 deletions packages/contracts-bedrock/src/governance/ProposalValidator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@ contract ProposalValidator is OwnableUpgradeable, ReinitializableBase, ISemver {

/// @notice Emitted when the voting cycle data is set.
/// @param cycleNumber The number of the voting cycle.
/// @param startBlock The block number of the starting block of the voting cycle.
/// @param startingTimestamp The starting timestamp of the voting cycle.
/// @param duration The duration of the voting cycle.
/// @param votingCycleDistributionLimit The max amount of tokens that can be distributed during the voting cycle.
event VotingCycleDataSet(
uint256 cycleNumber, uint256 startBlock, uint256 duration, uint256 votingCycleDistributionLimit
uint256 cycleNumber, uint256 startingTimestamp, uint256 duration, uint256 votingCycleDistributionLimit
);

/// @notice Emitted when the distribution threshold is set.
Expand Down Expand Up @@ -171,12 +171,13 @@ contract ProposalValidator is OwnableUpgradeable, ReinitializableBase, ISemver {
}

/// @notice Struct for storing voting cycle data.
/// @param startingBlock The block number of the starting block of the voting cycle.
/// @param duration The duration of the voting cycle.
/// @param startingTimestamp The starting timestamp of the voting cycle.
/// @param duration The duration of the voting cycle. Should be 1 day which is the end of Week 2 and start of Week 3
/// of the voting cycle.
/// @param votingCycleDistributionLimit The max amount of tokens that can be distributed in a proposal.
/// @param movedToVoteTokenCount The total amount of tokens to possibly be distributed in the voting cycle.
struct VotingCycleData {
uint256 startingBlock;
uint256 startingTimestamp;
uint256 duration;
uint256 votingCycleDistributionLimit;
uint256 movedToVoteTokenCount;
Expand Down Expand Up @@ -273,7 +274,7 @@ contract ProposalValidator is OwnableUpgradeable, ReinitializableBase, ISemver {
/// @param _owner The address that will own the contract.
/// @param _proposalTypesConfigurator The proposal types configurator contract address.
/// @param _cycleNumber The number of the current voting cycle.
/// @param _startBlock The block number of the starting block of the voting cycle.
/// @param _startingTimestamp The starting timestamp of the voting cycle.
/// @param _duration The duration of the voting cycle.
/// @param _votingCycleDistributionLimit The max amount of tokens that can be distributed during the voting cycle.
/// @param _distributionThreshold The max amount of tokens that can be distributed in a proposal.
Expand All @@ -283,7 +284,7 @@ contract ProposalValidator is OwnableUpgradeable, ReinitializableBase, ISemver {
address _owner,
IProposalTypesConfigurator _proposalTypesConfigurator,
uint256 _cycleNumber,
uint256 _startBlock,
uint256 _startingTimestamp,
uint256 _duration,
uint256 _votingCycleDistributionLimit,
uint256 _distributionThreshold,
Expand All @@ -298,7 +299,7 @@ contract ProposalValidator is OwnableUpgradeable, ReinitializableBase, ISemver {
}

proposalTypesConfigurator = _proposalTypesConfigurator;
_setVotingCycleData(_cycleNumber, _startBlock, _duration, _votingCycleDistributionLimit);
_setVotingCycleData(_cycleNumber, _startingTimestamp, _duration, _votingCycleDistributionLimit);
_setDistributionThreshold(_distributionThreshold);

for (uint256 i = 0; i < _proposalTypes.length; i++) {
Expand Down Expand Up @@ -712,10 +713,9 @@ contract ProposalValidator is OwnableUpgradeable, ReinitializableBase, ISemver {

// Check if the voting cycle is valid
VotingCycleData memory votingCycleData = votingCycles[proposal.votingCycle];
// TODO: is + duration correct?
if (
votingCycleData.startingBlock > block.number
|| votingCycleData.startingBlock + votingCycleData.duration < block.number
votingCycleData.startingTimestamp > block.timestamp
|| votingCycleData.startingTimestamp + votingCycleData.duration < block.timestamp
) {
revert ProposalValidator_InvalidVotingCycle();
}
Expand Down Expand Up @@ -805,10 +805,9 @@ contract ProposalValidator is OwnableUpgradeable, ReinitializableBase, ISemver {

// Check if proposal can be moved to vote
VotingCycleData memory votingCycleData = votingCycles[proposal.votingCycle];
// TODO: is + duration correct?
if (
votingCycleData.startingBlock > block.number
|| votingCycleData.startingBlock + votingCycleData.duration < block.number
votingCycleData.startingTimestamp > block.timestamp
|| votingCycleData.startingTimestamp + votingCycleData.duration < block.timestamp
) {
revert ProposalValidator_InvalidVotingCycle();
}
Expand Down Expand Up @@ -837,19 +836,21 @@ contract ProposalValidator is OwnableUpgradeable, ReinitializableBase, ISemver {

/// @notice Sets the data of a voting cycle.
/// @param _cycleNumber The number of the voting cycle to set.
/// @param _startBlock The block number of the starting block of the voting cycle.
/// @param _duration The duration of the voting cycle.
/// @param _startingTimestamp The starting timestamp of the voting cycle.
/// @param _duration The duration of the voting cycle. Should be 1 day which is the end of Week 2 and start of Week
/// 3
/// of the voting cycle.
/// @param _votingCycleDistributionLimit The max amount of tokens that can be distributed during the voting cycle.
function setVotingCycleData(
uint256 _cycleNumber,
uint256 _startBlock,
uint256 _startingTimestamp,
uint256 _duration,
uint256 _votingCycleDistributionLimit
)
external
onlyOwner
{
_setVotingCycleData(_cycleNumber, _startBlock, _duration, _votingCycleDistributionLimit);
_setVotingCycleData(_cycleNumber, _startingTimestamp, _duration, _votingCycleDistributionLimit);
}

/// @notice Sets the max amount of tokens that can be distributed in a proposal.
Expand Down Expand Up @@ -1021,28 +1022,30 @@ contract ProposalValidator is OwnableUpgradeable, ReinitializableBase, ISemver {

/// @notice Private function to set the voting cycle data and emit event.
/// @param _cycleNumber The number of the voting cycle to set.
/// @param _startBlock The block number of the starting block of the voting cycle.
/// @param _duration The duration of the voting cycle.
/// @param _startingTimestamp The starting timestamp of the voting cycle.
/// @param _duration The duration of the voting cycle. Should be 1 day which is the end of Week 2 and start of Week
/// 3
/// of the voting cycle.
/// @param _votingCycleDistributionLimit The max amount of tokens that can be distributed during the voting cycle.
function _setVotingCycleData(
uint256 _cycleNumber,
uint256 _startBlock,
uint256 _startingTimestamp,
uint256 _duration,
uint256 _votingCycleDistributionLimit
)
private
{
if (votingCycles[_cycleNumber].startingBlock != 0) {
if (votingCycles[_cycleNumber].startingTimestamp != 0) {
revert ProposalValidator_VotingCycleAlreadySet();
}

votingCycles[_cycleNumber] = VotingCycleData({
startingBlock: _startBlock,
startingTimestamp: _startingTimestamp,
duration: _duration,
votingCycleDistributionLimit: _votingCycleDistributionLimit,
movedToVoteTokenCount: 0
});
emit VotingCycleDataSet(_cycleNumber, _startBlock, _duration, _votingCycleDistributionLimit);
emit VotingCycleDataSet(_cycleNumber, _startingTimestamp, _duration, _votingCycleDistributionLimit);
}

/// @notice Private function to set the distribution threshold and emit event.
Expand Down
Loading