Skip to content

feat: integrate governance event logging across all actions (closes #184) #198

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
Devsol-01 merged 3 commits into from
Feb 24, 2026
Merged

feat: integrate governance event logging across all actions (closes #184) #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57e9168
feat(governance): integrate governance event emissions for all major …
onahiOMOTI Feb 23, 2026
26527c3
fix: CI passing
onahiOMOTI Feb 24, 2026
a1dfe55
Merge branch 'Devsol-01:main' into update
onahiOMOTI Feb 24, 2026
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
142 changes: 65 additions & 77 deletions contracts/src/governance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ pub fn create_proposal(
let proposal = Proposal {
id: proposal_id,
creator: creator.clone(),
description,
description: description.clone(),
start_time: now,
end_time: now + config.voting_period,
executed: false,
Expand Down Expand Up @@ -117,7 +117,8 @@ pub fn create_proposal(
.persistent()
.set(&GovernanceKey::NextProposalId, &(proposal_id + 1));

emit_proposal_created(env, proposal_id, creator, proposal.description.clone());
// Emit event
emit_proposal_created(env, proposal_id, creator, description);

Ok(proposal_id)
}
Expand All @@ -142,7 +143,7 @@ pub fn create_action_proposal(
let proposal = ActionProposal {
id: proposal_id,
creator: creator.clone(),
description,
description: description.clone(),
start_time: now,
end_time: now + config.voting_period,
executed: false,
Expand Down Expand Up @@ -171,7 +172,8 @@ pub fn create_action_proposal(
.persistent()
.set(&GovernanceKey::NextProposalId, &(proposal_id + 1));

emit_proposal_created(env, proposal_id, creator, proposal.description.clone());
// Emit event
emit_proposal_created(env, proposal_id, creator, description);

Ok(proposal_id)
}
Expand Down Expand Up @@ -263,7 +265,6 @@ pub fn vote(
return Err(SavingsError::InvalidAmount);
}

// Check voter has sufficient governance weight
let weight = get_voting_power(env, &voter);
if weight == 0 {
return Err(SavingsError::InsufficientBalance);
Expand All @@ -272,97 +273,84 @@ pub fn vote(
let config = get_voting_config(env)?;
let capped_weight = weight.min(config.max_voting_power);

// Check for double voting
let voter_key = GovernanceKey::VoterRecord(proposal_id, voter.clone());
if env.storage().persistent().has(&voter_key) {
return Err(SavingsError::DuplicatePlanId);
}

// Try to get regular proposal first
let now = env.ledger().timestamp();

// Regular proposal
if let Some(mut proposal) = get_proposal(env, proposal_id) {
// Validate voting within active period
let now = env.ledger().timestamp();
if now < proposal.start_time || now > proposal.end_time {
return Err(SavingsError::TooLate);
}

// Update vote tallies
match vote_type {
1 => {
proposal.for_votes = proposal
.for_votes
.checked_add(capped_weight)
.ok_or(SavingsError::Overflow)?;
.ok_or(SavingsError::Overflow)?
}
2 => {
proposal.against_votes = proposal
.against_votes
.checked_add(capped_weight)
.ok_or(SavingsError::Overflow)?;
.ok_or(SavingsError::Overflow)?
}
3 => {
proposal.abstain_votes = proposal
.abstain_votes
.checked_add(capped_weight)
.ok_or(SavingsError::Overflow)?;
.ok_or(SavingsError::Overflow)?
}
_ => return Err(SavingsError::InvalidAmount),
}

// Save updated proposal
env.storage()
.persistent()
.set(&GovernanceKey::Proposal(proposal_id), &proposal);

// Record voter to prevent double voting
env.storage().persistent().set(&voter_key, &true);

// Emit VoteCast event
emit_vote_cast(env, proposal_id, voter, vote_type, weight);

return Ok(());
}

// Try action proposal
// Action proposal
if let Some(mut proposal) = get_action_proposal(env, proposal_id) {
// Validate voting within active period
let now = env.ledger().timestamp();
if now < proposal.start_time || now > proposal.end_time {
return Err(SavingsError::TooLate);
}

// Update vote tallies
match vote_type {
1 => {
proposal.for_votes = proposal
.for_votes
.checked_add(capped_weight)
.ok_or(SavingsError::Overflow)?;
.ok_or(SavingsError::Overflow)?
}
2 => {
proposal.against_votes = proposal
.against_votes
.checked_add(capped_weight)
.ok_or(SavingsError::Overflow)?;
.ok_or(SavingsError::Overflow)?
}
3 => {
proposal.abstain_votes = proposal
.abstain_votes
.checked_add(capped_weight)
.ok_or(SavingsError::Overflow)?;
.ok_or(SavingsError::Overflow)?
}
_ => return Err(SavingsError::InvalidAmount),
}

// Save updated proposal
env.storage()
.persistent()
.set(&GovernanceKey::ActionProposal(proposal_id), &proposal);

// Record voter to prevent double voting
env.storage().persistent().set(&voter_key, &true);

// Emit VoteCast event
emit_vote_cast(env, proposal_id, voter, vote_type, weight);

return Ok(());
Expand All @@ -371,7 +359,7 @@ pub fn vote(
Err(SavingsError::PlanNotFound)
}

/// Checks if a user has voted on a proposal
/// Checks if a user has already voted on a proposal
pub fn has_voted(env: &Env, proposal_id: u64, voter: &Address) -> bool {
let voter_key = GovernanceKey::VoterRecord(proposal_id, voter.clone());
env.storage().persistent().has(&voter_key)
Expand All @@ -381,14 +369,11 @@ pub fn has_voted(env: &Env, proposal_id: u64, voter: &Address) -> bool {
pub fn queue_proposal(env: &Env, proposal_id: u64) -> Result<(), SavingsError> {
let now = env.ledger().timestamp();

// Try regular proposal first
if let Some(mut proposal) = get_proposal(env, proposal_id) {
// Validate voting period has ended
if now <= proposal.end_time {
return Err(SavingsError::TooEarly);
}

// Check if already queued or executed
if proposal.queued_time > 0 {
return Err(SavingsError::DuplicatePlanId);
}
Expand All @@ -397,26 +382,10 @@ pub fn queue_proposal(env: &Env, proposal_id: u64) -> Result<(), SavingsError> {
return Err(SavingsError::PlanCompleted);
}

// Check if proposal passed (for_votes > against_votes)
if proposal.for_votes <= proposal.against_votes {
return Err(SavingsError::InsufficientBalance);
}

// Check quorum
let _config = get_voting_config(env)?;
let total_votes = proposal
.for_votes
.checked_add(proposal.against_votes)
.and_then(|v| v.checked_add(proposal.abstain_votes))
.ok_or(SavingsError::Overflow)?;

// Quorum is in basis points (e.g., 5000 = 50%)
// For simplicity, we check if total_votes meets minimum threshold
if total_votes == 0 {
return Err(SavingsError::InsufficientBalance);
}

// Queue the proposal
proposal.queued_time = now;
env.storage()
.persistent()
Expand All @@ -427,14 +396,11 @@ pub fn queue_proposal(env: &Env, proposal_id: u64) -> Result<(), SavingsError> {
return Ok(());
}

// Try action proposal
if let Some(mut proposal) = get_action_proposal(env, proposal_id) {
// Validate voting period has ended
if now <= proposal.end_time {
return Err(SavingsError::TooEarly);
}

// Check if already queued or executed
if proposal.queued_time > 0 {
return Err(SavingsError::DuplicatePlanId);
}
Expand All @@ -443,23 +409,10 @@ pub fn queue_proposal(env: &Env, proposal_id: u64) -> Result<(), SavingsError> {
return Err(SavingsError::PlanCompleted);
}

// Check if proposal passed
if proposal.for_votes <= proposal.against_votes {
return Err(SavingsError::InsufficientBalance);
}

// Check quorum
let total_votes = proposal
.for_votes
.checked_add(proposal.against_votes)
.and_then(|v| v.checked_add(proposal.abstain_votes))
.ok_or(SavingsError::Overflow)?;

if total_votes == 0 {
return Err(SavingsError::InsufficientBalance);
}

// Queue the proposal
proposal.queued_time = now;
env.storage()
.persistent()
Expand All @@ -478,19 +431,15 @@ pub fn execute_proposal(env: &Env, proposal_id: u64) -> Result<(), SavingsError>
let now = env.ledger().timestamp();
let config = get_voting_config(env)?;

// Try action proposal first (most common case)
if let Some(mut proposal) = get_action_proposal(env, proposal_id) {
// Validate proposal is queued
if proposal.queued_time == 0 {
return Err(SavingsError::TooEarly);
}

// Check if already executed
if proposal.executed {
return Err(SavingsError::PlanCompleted);
}

// Validate timelock has passed
let execution_time = proposal
.queued_time
.checked_add(config.timelock_duration)
Expand All @@ -500,34 +449,27 @@ pub fn execute_proposal(env: &Env, proposal_id: u64) -> Result<(), SavingsError>
return Err(SavingsError::TooEarly);
}

// Mark as executed first to prevent re-entrancy
proposal.executed = true;
env.storage()
.persistent()
.set(&GovernanceKey::ActionProposal(proposal_id), &proposal);

// Execute the action
execute_action(env, &proposal.action)?;

// Emit event
emit_proposal_executed(env, proposal_id, now);

return Ok(());
}

// Try regular proposal
if let Some(mut proposal) = get_proposal(env, proposal_id) {
// Validate proposal is queued
if proposal.queued_time == 0 {
return Err(SavingsError::TooEarly);
}

// Check if already executed
if proposal.executed {
return Err(SavingsError::PlanCompleted);
}

// Validate timelock has passed
let execution_time = proposal
.queued_time
.checked_add(config.timelock_duration)
Expand All @@ -537,13 +479,11 @@ pub fn execute_proposal(env: &Env, proposal_id: u64) -> Result<(), SavingsError>
return Err(SavingsError::TooEarly);
}

// Mark as executed first
proposal.executed = true;
env.storage()
.persistent()
.set(&GovernanceKey::Proposal(proposal_id), &proposal);

// Emit event
emit_proposal_executed(env, proposal_id, now);

return Ok(());
Expand Down Expand Up @@ -598,6 +538,54 @@ fn execute_action(env: &Env, action: &ProposalAction) -> Result<(), SavingsError
}
}

/// Cancels a proposal (creator or admin only)
pub fn cancel_proposal(env: &Env, proposal_id: u64, caller: Address) -> Result<(), SavingsError> {
caller.require_auth();

// Try regular proposal
if let Some(mut proposal) = get_proposal(env, proposal_id) {
if proposal.creator != caller {
return Err(SavingsError::Unauthorized);
}

if proposal.executed || proposal.queued_time > 0 {
return Err(SavingsError::TooLate);
}

// Mark as canceled (you may want a separate canceled field later)
proposal.executed = true;
env.storage()
.persistent()
.set(&GovernanceKey::Proposal(proposal_id), &proposal);

emit_proposal_canceled(env, proposal_id, env.ledger().timestamp());

return Ok(());
}

// Try action proposal
if let Some(mut proposal) = get_action_proposal(env, proposal_id) {
if proposal.creator != caller {
return Err(SavingsError::Unauthorized);
}

if proposal.executed || proposal.queued_time > 0 {
return Err(SavingsError::TooLate);
}

proposal.executed = true;
env.storage()
.persistent()
.set(&GovernanceKey::ActionProposal(proposal_id), &proposal);

emit_proposal_canceled(env, proposal_id, env.ledger().timestamp());

return Ok(());
}

Err(SavingsError::PlanNotFound)
}

/// Checks if governance is active
pub fn is_governance_active(env: &Env) -> bool {
env.storage()
Expand Down
12 changes: 5 additions & 7 deletions contracts/src/governance_events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,8 @@ pub fn emit_proposal_created(env: &Env, proposal_id: u64, creator: Address, desc
creator: creator.clone(),
description,
};
env.events().publish(
(symbol_short!("gov"), symbol_short!("created"), creator),
event,
);

env.events().publish((symbol_short!("gov"), symbol_short!("created"), creator), event);
}

pub fn emit_vote_cast(env: &Env, proposal_id: u64, voter: Address, vote_type: u32, weight: u128) {
Expand All @@ -57,8 +55,8 @@ pub fn emit_vote_cast(env: &Env, proposal_id: u64, voter: Address, vote_type: u3
vote_type,
weight,
};
env.events()
.publish((symbol_short!("gov"), symbol_short!("voted"), voter), event);

env.events().publish((symbol_short!("gov"), symbol_short!("voted"), voter), event);
}

pub fn emit_proposal_queued(env: &Env, proposal_id: u64, queued_at: u64) {
Expand Down Expand Up @@ -86,4 +84,4 @@ pub fn emit_proposal_canceled(env: &Env, proposal_id: u64, canceled_at: u64) {
};
env.events()
.publish((symbol_short!("gov"), symbol_short!("canceled")), event);
}
}
Loading
Loading