Skip to content
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
15 changes: 11 additions & 4 deletions contracts/predictify-hybrid/src/governance.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use crate::admin::{AdminAccessControl, AdminPermission};
use crate::events::EventEmitter;
use soroban_sdk::{contracttype, panic_with_error, Address, Bytes, BytesN, Env, String, Symbol, Vec};

Expand Down Expand Up @@ -816,14 +817,20 @@ impl GovernanceContract {
/// Simple helper to check admin
fn ensure_admin(env: &Env, caller: Address) -> Result<(), GovernanceError> {
caller.require_auth();
let admin: Address = env

let primary_admin: Address = env
.storage()
.persistent()
.get(&StorageKey::Admin)
.ok_or(GovernanceError::NotInitialized)?;
if admin != caller {
return Err(GovernanceError::NotAdmin);

if primary_admin == caller {
return Ok(());
}

match AdminAccessControl::validate_permission(env, &caller, &AdminPermission::UpdateConfig) {
Ok(()) => Ok(()),
Err(_) => Err(GovernanceError::NotAdmin),
}
Ok(())
}
}
20 changes: 20 additions & 0 deletions contracts/predictify-hybrid/src/governance_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,26 @@ fn governance_set_voting_period_is_applied_to_new_proposals() {
assert_eq!(proposal.end_time - proposal.start_time, 250);
}

#[test]
fn governance_requires_explicit_config_capability_for_admin_changes() {
let fixture = GovernanceFixture::new(100, 1);
let delegated_admin = Address::generate(&fixture.env);

fixture.env.as_contract(&fixture.contract_id, || {
crate::admin::AdminSystemIntegration::ensure_migration(&fixture.env).unwrap();
crate::admin::AdminManager::add_admin(
&fixture.env,
&fixture.admin,
&delegated_admin,
crate::admin::AdminRole::ConfigAdmin,
)
.unwrap();
});

assert!(fixture.set_quorum(delegated_admin.clone(), 7).is_ok());
assert_eq!(fixture.set_quorum(Address::generate(&fixture.env), 9), Err(GovernanceError::NotAdmin));
}

/// ---- Quorum Decay Tests ----

#[test]
Expand Down
Loading