Skip to content

[Core] Enforce quorum threshold logic for execution #816

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
p3ris0n merged 3 commits into from
Aug 27, 2026
Merged

[Core] Enforce quorum threshold logic for execution #816

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
eaf6c90
feat(admin): add require_upgrade_quorum_met guard for WASM upgrades
ZeePearl56 Aug 26, 2026
8ec1872
Merge remote-tracking branch 'upstream/main' into feature/656-enforce…
ZeePearl56 Aug 27, 2026
41376ea
Merge remote-tracking branch 'upstream/main' into feature/656-enforce…
ZeePearl56 Aug 27, 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
63 changes: 63 additions & 0 deletions contracts/admin/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,6 +1446,36 @@ pub fn approve_upgrade(env: &Env, voter: Address, proposal_id: u64) -> Result<()
Ok(())
}

/// Checks that an [`UpgradeProposal`]'s weighted vote tally has reached its
/// snapshotted quorum. Resolves issue #656.
///
/// The tally is recomputed from `proposal.votes` on every call rather than
/// trusting `proposal.status`, so this guard stays correct as a building
/// block for the upgrade-execution path ahead of `execute_upgrade` (#655)
/// landing for this proposal type.
///
/// # Errors
///
/// Returns [`AdminError::QuorumNotMet`] if the summed vote weight is below
/// `proposal.quorum`.
///
/// @notice Reverts unless `proposal`'s unique approvals meet or exceed its quorum.
/// @dev Sums the weights recorded in `proposal.votes`; each entry is keyed by a unique voter address, so the sum can never double-count a signer.
/// @param proposal The upgrade proposal to check.
/// @return `Ok(())` if quorum is met, or `AdminError::QuorumNotMet` otherwise.
pub fn require_upgrade_quorum_met(proposal: &UpgradeProposal) -> Result<(), AdminError> {
let tally: u64 = proposal
.votes
.values()
.into_iter()
.map(|weight| weight as u64)
.sum();
if tally < proposal.quorum {
return Err(AdminError::QuorumNotMet);
}
Ok(())
}

/// Withdraws a multi-sig WASM upgrade proposal before it executes. Resolves
/// issue #662.
///
Expand Down Expand Up @@ -3985,6 +4015,39 @@ mod tests {
);
}

// ── require_upgrade_quorum_met (#656) ───────────────────────────────────

#[test]
fn test_require_upgrade_quorum_met_reports_deficit() {
let env = Env::default();
// `upgrade_proposal_fixture` carries a single vote against `quorum: 2`.
let proposal = upgrade_proposal_fixture(&env);

assert_eq!(
require_upgrade_quorum_met(&proposal),
Err(AdminError::QuorumNotMet)
);
}

#[test]
fn test_require_upgrade_quorum_met_succeeds_when_tally_meets_quorum() {
let env = Env::default();
let mut proposal = upgrade_proposal_fixture(&env);
// Add a second unique voter so the tally reaches the fixture's `quorum: 2`.
proposal.votes.set(Address::generate(&env), 1u32);

assert!(require_upgrade_quorum_met(&proposal).is_ok());
}

#[test]
fn test_require_upgrade_quorum_met_succeeds_when_tally_exceeds_quorum() {
let env = Env::default();
let mut proposal = upgrade_proposal_fixture(&env);
proposal.quorum = 1;

assert!(require_upgrade_quorum_met(&proposal).is_ok());
}

// ── approve_upgrade (#654) ──────────────────────────────────────────────

fn seed_upgrade_proposal(
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.23.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "Pauser"
"symbol": "SuperAdmin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.32.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "SuperAdmin"
"symbol": "Pauser"
}
]
},
Expand Down
3 changes: 2 additions & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.37.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -259,7 +260,7 @@
{
"vec": [
{
"symbol": "Admin"
"symbol": "Pauser"
}
]
},
Expand Down
3 changes: 2 additions & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.38.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -259,7 +260,7 @@
{
"vec": [
{
"symbol": "Admin"
"symbol": "SuperAdmin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.41.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "Pauser"
"symbol": "SuperAdmin"
}
]
},
Expand Down
3 changes: 2 additions & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.43.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -259,7 +260,7 @@
{
"vec": [
{
"symbol": "Admin"
"symbol": "Minter"
}
]
},
Expand Down
3 changes: 2 additions & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.45.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -259,7 +260,7 @@
{
"vec": [
{
"symbol": "Admin"
"symbol": "Pauser"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.46.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "Pauser"
}
]
},
Expand Down
3 changes: 2 additions & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.47.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -259,7 +260,7 @@
{
"vec": [
{
"symbol": "Admin"
"symbol": "SuperAdmin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.48.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "SuperAdmin"
}
]
},
Expand Down
3 changes: 2 additions & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.51.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -259,7 +260,7 @@
{
"vec": [
{
"symbol": "Admin"
"symbol": "SuperAdmin"
}
]
},
Expand Down
3 changes: 1 addition & 2 deletions contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.52.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -260,7 +259,7 @@
{
"vec": [
{
"symbol": "Pauser"
"symbol": "Admin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.66.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "Pauser"
"symbol": "SuperAdmin"
}
]
},
Expand Down
3 changes: 2 additions & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.69.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -259,7 +260,7 @@
{
"vec": [
{
"symbol": "Admin"
"symbol": "Minter"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "Pauser"
"symbol": "SuperAdmin"
}
]
},
Expand Down
3 changes: 1 addition & 2 deletions contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.73.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -260,7 +259,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "Admin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.75.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "Pauser"
}
]
},
Expand Down
3 changes: 1 addition & 2 deletions contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.89.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -260,7 +259,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "Admin"
}
]
},
Expand Down
3 changes: 2 additions & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.9.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -259,7 +260,7 @@
{
"vec": [
{
"symbol": "Admin"
"symbol": "Pauser"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.93.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "SuperAdmin"
"symbol": "Minter"
}
]
},
Expand Down
3 changes: 1 addition & 2 deletions contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.94.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -260,7 +259,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "Admin"
}
]
},
Expand Down
6 changes: 3 additions & 3 deletions contracts/admin/test_snapshots/tests/proptest/fuzz_grant_role_emits_event.13.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{
"vec": [
{
"symbol": "SuperAdmin"
"symbol": "Minter"
}
]
},
Expand Down Expand Up @@ -127,7 +127,7 @@
},
"durability": "persistent",
"val": {
"u32": 4
"u32": 2
}
}
},
Expand Down Expand Up @@ -292,7 +292,7 @@
{
"vec": [
{
"symbol": "SuperAdmin"
"symbol": "Minter"
}
]
},
Expand Down
Loading
Loading