Skip to content

Refactor: extract pending-admin cleanup to shared helper #77

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
onyekachi66 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refactor: extract pending-admin cleanup to shared helper #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 27 additions & 10 deletions contracts/globe-wallet/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,15 @@ impl GlobeWallet {
Ok(())
}

/// Internal helper to guarantee the structural invariant that any time the
/// admin changes, the pending-admin entry keyed to the old admin's address is cleaned up.
fn set_admin_and_clear_pending(env: &Env, old_admin: &Address, new_admin: &Address) {
env.storage()
.instance()
.remove(&DataKey::PendingAdmin(old_admin.clone()));
env.storage().instance().set(&DataKey::Admin, new_admin);
}

/// Accept a pending admin proposal.
pub fn accept_admin(env: Env, candidate: Address) -> Result<(), WalletError> {
candidate.require_auth();
Expand All @@ -258,10 +267,7 @@ impl GlobeWallet {
if pending != candidate {
return Err(WalletError::Unauthorized);
}
env.storage().instance().set(&DataKey::Admin, &candidate);
env.storage()
.instance()
.remove(&DataKey::PendingAdmin(admin.clone()));
Self::set_admin_and_clear_pending(&env, &admin, &candidate);
env.events().publish(
(Symbol::new(&env, "admin_transferred"),),
(admin, candidate),
Expand Down Expand Up @@ -748,12 +754,7 @@ impl GlobeWallet {
.instance()
.get(&DataKey::Admin)
.ok_or(WalletError::NotInitialized)?;
env.storage()
.instance()
.remove(&DataKey::PendingAdmin(old_admin.clone()));
env.storage()
.instance()
.set(&DataKey::Admin, &proposal.new_admin);
Self::set_admin_and_clear_pending(&env, &old_admin, &proposal.new_admin);
env.storage().instance().remove(&DataKey::RecoveryProposal);
// Same event name/shape as a normal transfer: downstream indexers
// and the mobile app don't need to special-case recovery-driven
Expand Down Expand Up @@ -1483,6 +1484,22 @@ mod tests {
);
}

#[test]
fn test_pending_admin_entry_removed_after_normal_accept() {
let (env, _cid, admin, client) = setup();
let candidate = Address::generate(&env);
client.propose_admin(&admin, &candidate);
client.accept_admin(&candidate);

// Explicitly assert the old PendingAdmin(admin) key no longer resolves — a fresh propose
// targeting the SAME old admin address should find no leftover pending entry:
client.propose_admin(&candidate, &admin); // new admin proposes transferring back
assert_eq!(
client.try_accept_admin(&admin), // should require a fresh acceptance, not reuse stale state
Err(Ok(WalletError::NoPendingAdmin))
);
}

#[test]
fn test_max_assets_limit() {
let (env, _cid, _admin, client) = setup();
Expand Down