Skip to content

Solvefix #667

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

Open
69starman wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Solvefix #667

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f1b85b
refactor(registry): centralize admin authorization
69starman Aug 26, 2026
0bdea44
Merge branch 'main' into solvefix
69starman Sep 6, 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
52 changes: 16 additions & 36 deletions contracts/registry/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,7 @@ impl RegistryContract {
panic_with_error!(&env, RegistryError::BatchSizeExceeded);
}

let admin: Address = env
.storage()
.instance()
.get(&DataKey::Admin)
.unwrap_or_else(|| panic_with_error!(&env, RegistryError::NotFound));
admin.require_auth();
let admin = Self::require_admin_auth(&env);

// Pre-validate ALL entries' metadata before processing any of them.
// This ensures atomicity: if any entry has invalid metadata, the
Expand Down Expand Up @@ -485,12 +480,7 @@ impl RegistryContract {
/// let result = client.revoke(&issuer);
/// ```
pub fn revoke(env: Env, address: Address) -> bool {
let admin: Address = env
.storage()
.instance()
.get(&DataKey::Admin)
.unwrap_or_else(|| panic_with_error!(&env, RegistryError::NotFound));
admin.require_auth();
let admin = Self::require_admin_auth(&env);
let key = DataKey::Profile(address.clone());
let mut profile: Profile = env
.storage()
Expand Down Expand Up @@ -540,12 +530,7 @@ impl RegistryContract {
/// let ok = client.reinstate(&issuer);
/// ```
pub fn reinstate(env: Env, address: Address) -> bool {
let admin: Address = env
.storage()
.instance()
.get(&DataKey::Admin)
.unwrap_or_else(|| panic_with_error!(&env, RegistryError::NotFound));
admin.require_auth();
let admin = Self::require_admin_auth(&env);
let key = DataKey::Profile(address.clone());
let mut profile: Profile = env
.storage()
Expand All @@ -564,12 +549,7 @@ impl RegistryContract {
}

pub fn verify_profile(env: Env, address: Address, verify: bool) -> bool {
let admin: Address = env
.storage()
.instance()
.get(&DataKey::Admin)
.unwrap_or_else(|| panic_with_error!(&env, RegistryError::NotFound));
admin.require_auth();
let admin = Self::require_admin_auth(&env);
let key = DataKey::Profile(address.clone());
let mut profile: Profile = env
.storage()
Expand Down Expand Up @@ -608,12 +588,7 @@ impl RegistryContract {
// ```ignore
// client.transfer_ownership(&new_admin);
// ```
let admin: Address = env
.storage()
.instance()
.get(&DataKey::Admin)
.unwrap_or_else(|| panic_with_error!(&env, RegistryError::NotFound));
admin.require_auth();
let admin = Self::require_admin_auth(&env);
new_admin.require_auth();
env.storage().instance().set(&DataKey::Admin, &new_admin);
events::ownership_transferred(&env, &admin, &new_admin);
Expand Down Expand Up @@ -648,12 +623,7 @@ impl RegistryContract {
/// client.transfer_admin(&new_admin);
/// ```
pub fn transfer_admin(env: Env, new_admin: Address) {
let admin: Address = env
.storage()
.instance()
.get(&DataKey::Admin)
.unwrap_or_else(|| panic_with_error!(&env, RegistryError::NotFound));
admin.require_auth();
let admin = Self::require_admin_auth(&env);
env.storage().instance().set(&DataKey::Admin, &new_admin);
events::admin_transferred(&env, &admin, &new_admin);
Self::extend_instance_ttl(&env);
Expand Down Expand Up @@ -696,6 +666,16 @@ impl RegistryContract {
}

impl RegistryContract {
fn require_admin_auth(env: &Env) -> Address {
let admin = env
.storage()
.instance()
.get(&DataKey::Admin)
.unwrap_or_else(|| panic_with_error!(env, RegistryError::NotFound));
admin.require_auth();
admin
}

fn require_initialized(env: &Env) {
if !env.storage().instance().has(&DataKey::Admin) {
panic_with_error!(env, RegistryError::NotInitialized);
Expand Down
Loading