blockworks-foundation
/
solana-program-library
mirror of https://github.com/blockworks-foundation/solana-program-library.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Governance: Use saturating sub to decrease voting proposal count (#2840) 

* fix: use saturating_sub for voting_proposal_count

* chore: update voting_proposal_count comments
This commit is contained in:
Sebastian Bor 2022-01-30 22:10:58 +00:00 committed by GitHub
parent 2600963545
commit c9f8dda737
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
governance/program/src/processor/process_cancel_proposal.rs
View File

@ -50,14 +50,12 @@ pub fn process_cancel_proposal(program_id: &Pubkey, accounts: &[AccountInfo]) ->
if proposal_data.state == ProposalState::Voting { if proposal_data.state == ProposalState::Voting {
// Update Realm voting_proposal_count // Update Realm voting_proposal_count
realm_data.voting_proposal_count = realm_data.voting_proposal_count.checked_sub(1).unwrap(); realm_data.voting_proposal_count = realm_data.voting_proposal_count.saturating_sub(1);
realm_data.serialize(&mut *realm_info.data.borrow_mut())?; realm_data.serialize(&mut *realm_info.data.borrow_mut())?;
// Update Governance voting_proposal_count // Update Governance voting_proposal_count
governance_data.voting_proposal_count = governance_data governance_data.voting_proposal_count =
.voting_proposal_count governance_data.voting_proposal_count.saturating_sub(1);
.checked_sub(1)
.unwrap();
governance_data.serialize(&mut *governance_info.data.borrow_mut())?; governance_data.serialize(&mut *governance_info.data.borrow_mut())?;
} }

8
governance/program/src/processor/process_cast_vote.rs
View File

@ -167,14 +167,12 @@ pub fn process_cast_vote(
}; };
// Update Realm voting_proposal_count // Update Realm voting_proposal_count
realm_data.voting_proposal_count = realm_data.voting_proposal_count.checked_sub(1).unwrap(); realm_data.voting_proposal_count = realm_data.voting_proposal_count.saturating_sub(1);
realm_data.serialize(&mut *realm_info.data.borrow_mut())?; realm_data.serialize(&mut *realm_info.data.borrow_mut())?;
// Update Governance voting_proposal_count // Update Governance voting_proposal_count
governance_data.voting_proposal_count = governance_data governance_data.voting_proposal_count =
.voting_proposal_count governance_data.voting_proposal_count.saturating_sub(1);
.checked_sub(1)
.unwrap();
governance_data.serialize(&mut *governance_info.data.borrow_mut())?; governance_data.serialize(&mut *governance_info.data.borrow_mut())?;
} }

7
governance/program/src/processor/process_finalize_vote.rs
View File

@ -74,14 +74,11 @@ pub fn process_finalize_vote(program_id: &Pubkey, accounts: &[AccountInfo]) -> P
proposal_data.serialize(&mut *proposal_info.data.borrow_mut())?; proposal_data.serialize(&mut *proposal_info.data.borrow_mut())?;
// Update Realm voting_proposal_count // Update Realm voting_proposal_count
realm_data.voting_proposal_count = realm_data.voting_proposal_count.checked_sub(1).unwrap(); realm_data.voting_proposal_count = realm_data.voting_proposal_count.saturating_sub(1);
realm_data.serialize(&mut *realm_info.data.borrow_mut())?; realm_data.serialize(&mut *realm_info.data.borrow_mut())?;
// Update Governance voting_proposal_count // Update Governance voting_proposal_count
governance_data.voting_proposal_count = governance_data governance_data.voting_proposal_count = governance_data.voting_proposal_count.saturating_sub(1);
.voting_proposal_count
.checked_sub(1)
.unwrap();
governance_data.serialize(&mut *governance_info.data.borrow_mut())?; governance_data.serialize(&mut *governance_info.data.borrow_mut())?;
Ok(()) Ok(())

1
governance/program/src/processor/process_set_governance_config.rs
View File

@ -35,6 +35,7 @@ pub fn process_set_governance_config(
// Note: Config change leaves voting proposals in unpredictable state and it's DAOs responsibility // Note: Config change leaves voting proposals in unpredictable state and it's DAOs responsibility
// to ensure the changes are made when there are no proposals in voting state // to ensure the changes are made when there are no proposals in voting state
// For example changing approval quorum could accidentally make proposals to succeed which would otherwise be defeated // For example changing approval quorum could accidentally make proposals to succeed which would otherwise be defeated
// The check wouldn't have any effect when upgrading from V1 to V2 because it was not tracked in V1
// if governance_data.voting_proposal_count > 0 { // if governance_data.voting_proposal_count > 0 {
// return Err(GovernanceError::GovernanceConfigChangeNotAllowed.into()); // return Err(GovernanceError::GovernanceConfigChangeNotAllowed.into());

1
governance/program/src/processor/process_set_realm_config.rs
View File

@ -43,6 +43,7 @@ pub fn process_set_realm_config(
// Note: Config change leaves voting proposals in unpredictable state and it's DAOs responsibility // Note: Config change leaves voting proposals in unpredictable state and it's DAOs responsibility
// to ensure the changes are made when there are no proposals in voting state // to ensure the changes are made when there are no proposals in voting state
// For example changing voter-weight or max-voter-weight addin could accidentally make proposals to succeed which would otherwise be defeated // For example changing voter-weight or max-voter-weight addin could accidentally make proposals to succeed which would otherwise be defeated
// The check wouldn't have any effect when upgrading from V1 to V2 because it was not tracked in V1
// if realm_data.voting_proposal_count > 0 { // if realm_data.voting_proposal_count > 0 {
// return Err(GovernanceError::RealmConfigChangeNotAllowed.into()); // return Err(GovernanceError::RealmConfigChangeNotAllowed.into());