Skip to content
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.

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

add method to check how a particular account voted #51

Merged
merged 1 commit into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 18 additions & 4 deletions src/governor.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ pub trait IGovernor<TContractState> {
// Gets the proposal and the config version with which it was created
fn get_proposal_with_config(self: @TContractState, id: felt252) -> (ProposalInfo, Config);

// Returns the vote cast by the given voter on the given proposal ID.
// - 0 means not voted, or proposal does not exist
// - 3 means voted in favor
// - 1 means voted against
fn get_vote(self: @TContractState, id: felt252, voter: ContractAddress) -> u8;

// Change the configuration of the governor. Only affects proposals created after the configuration change. Must be called by self, e.g. via a proposal.
fn reconfigure(ref self: TContractState, config: Config) -> u64;

Expand Down Expand Up @@ -173,7 +179,7 @@ pub mod Governor {
config: Config,
nonce: u64,
proposals: LegacyMap<felt252, ProposalInfo>,
has_voted: LegacyMap<(ContractAddress, felt252), bool>,
vote: LegacyMap<(felt252, ContractAddress), u8>,
latest_proposal_by_proposer: LegacyMap<ContractAddress, felt252>,
latest_config_version: u64,
config_versions: LegacyMap<u64, Config>,
Expand Down Expand Up @@ -295,11 +301,11 @@ pub mod Governor {
let timestamp_current = get_block_timestamp();
let voting_start_time = (proposal.execution_state.created + config.voting_start_delay);
let voter = get_caller_address();
let has_voted = self.has_voted.read((voter, id));
let past_vote = self.vote.read((id, voter));

assert(timestamp_current >= voting_start_time, 'VOTING_NOT_STARTED');
assert(timestamp_current < (voting_start_time + config.voting_period), 'VOTING_ENDED');
assert(!has_voted, 'ALREADY_VOTED');
assert(past_vote.is_zero(), 'ALREADY_VOTED');

let weight = self
.get_staker()
Expand All @@ -315,7 +321,11 @@ pub mod Governor {
proposal.nay = proposal.nay + weight;
}
self.proposals.write(id, proposal);
self.has_voted.write((voter, id), true);
self.vote.write((id, voter), if yea {
3
} else {
1
});

self.emit(Voted { id, voter, weight, yea });
}
Expand Down Expand Up @@ -477,6 +487,10 @@ pub mod Governor {
(proposal, config)
}

fn get_vote(self: @ContractState, id: felt252, voter: ContractAddress) -> u8 {
self.vote.read((id, voter))
}

fn reconfigure(ref self: ContractState, config: Config) -> u64 {
self.check_self_call();

Expand Down
2 changes: 2 additions & 0 deletions src/governor_test.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,7 @@ fn test_vote_already_voted_should_fail() {

set_contract_address(voter1());
governor.vote(id, true);
assert_eq!(governor.get_vote(id, voter1()), 3);

// Trying to vote twice on the same proposal should fail
governor.vote(id, true);
Expand Down Expand Up @@ -738,6 +739,7 @@ fn test_execute_no_majority_should_fail() {

set_contract_address(voter2());
governor.vote(id, false);
assert_eq!(governor.get_vote(id, voter2()), 1);
let proposal = governor.get_proposal(id);
assert_eq!(proposal.yea, config.quorum);
assert_eq!(proposal.nay, config.quorum + 1);
Expand Down
Loading