Skip to content

refactor(admin): extract shared check helper #321

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
mikewheeleer merged 1 commit into from
Jul 27, 2026
Merged

refactor(admin): extract shared check helper #321

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
21 changes: 11 additions & 10 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,17 +323,22 @@ pub struct StableRouteRouter;

#[contractimpl]
impl StableRouteRouter {
/// Read the admin address from instance storage, panicking with
/// [`RouterError::NotInitialized`] if absent.
fn load_admin(env: &Env) -> Address {
env.storage()
.instance()
.get(&DataKey::Admin)
.unwrap_or_else(|| panic_with_error!(env, RouterError::NotInitialized))
}

/// Load the admin address, require its auth, and return it.
///
/// Every admin-gated entrypoint calls this instead of repeating the
/// six-line load-unwrap-require_auth block. Keeping it private
/// ensures it never appears in the generated client ABI.
fn require_admin(env: &Env) -> Address {
let admin: Address = env
.storage()
.instance()
.get(&DataKey::Admin)
.unwrap_or_else(|| panic_with_error!(env, RouterError::NotInitialized));
let admin = Self::load_admin(env);
admin.require_auth();
admin
}
Expand Down Expand Up @@ -1142,11 +1147,7 @@ impl StableRouteRouter {
liquidity: i128,
) {
caller.require_auth();
let admin: Address = env
.storage()
.instance()
.get(&DataKey::Admin)
.unwrap_or_else(|| panic_with_error!(&env, RouterError::NotInitialized));
let admin: Address = Self::load_admin(&env);
let oracle: Option<Address> = env.storage().persistent().get(&DataKey::Oracle);
if caller != admin && Some(caller.clone()) != oracle {
panic_with_error!(&env, RouterError::NotAuthorized);
Expand Down