Skip to content

fix: restore two-step ownership entrypoints #154

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

fix: restore two-step ownership entrypoints #154

Show file tree
Hide file tree
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
8 changes: 8 additions & 0 deletions contracts/token/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,10 @@ impl BcForgeToken {
Ok(())
}

pub fn propose_ownership(env: Env, new_admin: Address) -> Result<(), TokenError> {
Self::propose_owner(env, new_admin)
}

pub fn propose_owner(env: Env, new_admin: Address) -> Result<(), TokenError> {
let current_admin = Self::read_admin(&env)?;
current_admin.require_auth();
Expand Down Expand Up @@ -508,6 +512,10 @@ impl BcForgeToken {
Ok(())
}

pub fn cancel_ownership(env: Env) -> Result<(), TokenError> {
Self::cancel_transfer(env)
}

pub fn pending_owner(env: Env) -> Option<Address> {
Self::read_pending_admin(&env)
}
Expand Down
45 changes: 9 additions & 36 deletions contracts/token/src/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,19 +562,18 @@ fn test_transfer_ownership() {

#[test]
fn test_two_step_ownership_transfer_happy_path() {
fn test_role_management() {
let env = Env::default();
env.mock_all_auths();
let (client, _) = setup_contract(&env);
let admin = init_default(&env, &client);
let _admin = init_default(&env, &client);
let new_admin = Address::generate(&env);
let user = Address::generate(&env);

// Initially no pending owner
assert!(client.pending_owner().is_none());

// Propose new admin
client.propose_owner(&new_admin);
client.propose_ownership(&new_admin);

// Check pending owner
let pending = client.pending_owner();
Expand All @@ -595,28 +594,6 @@ fn test_role_management() {
#[test]
#[should_panic(expected = "no pending ownership transfer")]
fn test_accept_ownership_without_proposal_fails() {
let minter = Address::generate(&env);
let user = Address::generate(&env);

// Minter doesn't have the role initially
assert!(!client.has_role(&Role::Minter, &minter));

// Admin grants Minter role
client.grant_role(&Role::Minter, &minter);
assert!(client.has_role(&Role::Minter, &minter));

// Minter can now mint
client.mint(&minter, &user, &100);
assert_eq!(client.balance(&user), 100);

// Admin revokes Minter role
client.revoke_role(&Role::Minter, &minter);
assert!(!client.has_role(&Role::Minter, &minter));
}

#[test]
#[should_panic(expected = "unauthorized: missing role")]
fn test_mint_unauthorized_role() {
let env = Env::default();
env.mock_all_auths();
let (client, _) = setup_contract(&env);
Expand All @@ -627,34 +604,34 @@ fn test_mint_unauthorized_role() {
}

#[test]
fn test_cancel_transfer() {
fn test_cancel_ownership() {
let env = Env::default();
env.mock_all_auths();
let (client, _) = setup_contract(&env);
let admin = init_default(&env, &client);
let new_admin = Address::generate(&env);

// Propose new admin
client.propose_owner(&new_admin);
client.propose_ownership(&new_admin);
assert!(client.pending_owner().is_some());

// Cancel the transfer
client.cancel_transfer();
client.cancel_ownership();

// Pending owner should be cleared
assert!(client.pending_owner().is_none());
}

#[test]
#[should_panic(expected = "no pending ownership transfer")]
fn test_cancel_transfer_without_proposal_fails() {
fn test_cancel_ownership_without_proposal_fails() {
let env = Env::default();
env.mock_all_auths();
let (client, _) = setup_contract(&env);
let _admin = init_default(&env, &client);

// Try to cancel without proposal
client.cancel_transfer();
client.cancel_ownership();
}

#[test]
Expand All @@ -667,16 +644,12 @@ fn test_double_propose_updates_pending_admin() {
let second_proposal = Address::generate(&env);

// First proposal
client.propose_owner(&first_proposal);
client.propose_ownership(&first_proposal);
assert_eq!(client.pending_owner().unwrap(), first_proposal);

// Second proposal (should override first)
client.propose_owner(&second_proposal);
client.propose_ownership(&second_proposal);
assert_eq!(client.pending_owner().unwrap(), second_proposal);
let non_minter = Address::generate(&env);
let user = Address::generate(&env);

client.mint(&non_minter, &user, &100);
}

// ─── Pause / Unpause ─────────────────────────────────────────────────────────
Expand Down
Loading