From 02d980f4e42f352550f956f06118a23baf4863ed Mon Sep 17 00:00:00 2001 From: microwavedcola1 <89031858+microwavedcola1@users.noreply.github.com> Date: Mon, 13 Feb 2023 20:02:47 +0100 Subject: [PATCH] restrict what a security admin can do (#452) Signed-off-by: microwavedcola1 --- .../mango-v4/src/instructions/account_toggle_freeze.rs | 2 +- programs/mango-v4/src/instructions/perp_edit_market.rs | 7 +------ programs/mango-v4/src/instructions/token_edit.rs | 7 +------ 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/programs/mango-v4/src/instructions/account_toggle_freeze.rs b/programs/mango-v4/src/instructions/account_toggle_freeze.rs index 7ba414e67..9055b828d 100644 --- a/programs/mango-v4/src/instructions/account_toggle_freeze.rs +++ b/programs/mango-v4/src/instructions/account_toggle_freeze.rs @@ -7,7 +7,7 @@ use crate::state::*; pub struct AccountToggleFreeze<'info> { #[account( constraint = group.load()?.is_ix_enabled(IxGate::AccountToggleFreeze) @ MangoError::IxIsDisabled, - constraint = group.load()?.admin == admin.key() || group.load()?.security_admin == admin.key(), + constraint = group.load()?.admin == admin.key() )] pub group: AccountLoader<'info, Group>, diff --git a/programs/mango-v4/src/instructions/perp_edit_market.rs b/programs/mango-v4/src/instructions/perp_edit_market.rs index 1bfccc7e8..2c2487efa 100644 --- a/programs/mango-v4/src/instructions/perp_edit_market.rs +++ b/programs/mango-v4/src/instructions/perp_edit_market.rs @@ -109,13 +109,8 @@ pub fn perp_edit_market( MangoError::InitAssetWeightCantBeNegative ); - let old_init_base_asset_weight = perp_market.init_base_asset_weight; perp_market.init_base_asset_weight = I80F48::from_num(init_base_asset_weight); - - // security admin can only reduce init_base_asset_weight - if old_init_base_asset_weight < perp_market.init_base_asset_weight { - require_group_admin = true; - } + require_group_admin = true; } if let Some(maint_base_liab_weight) = maint_base_liab_weight_opt { msg!( diff --git a/programs/mango-v4/src/instructions/token_edit.rs b/programs/mango-v4/src/instructions/token_edit.rs index 559fba780..517dbbc7c 100644 --- a/programs/mango-v4/src/instructions/token_edit.rs +++ b/programs/mango-v4/src/instructions/token_edit.rs @@ -172,13 +172,8 @@ pub fn token_edit( MangoError::InitAssetWeightCantBeNegative ); - let old_init_asset_weight = bank.init_asset_weight; bank.init_asset_weight = I80F48::from_num(init_asset_weight); - - // security admin can only reduce init_base_asset_weight - if old_init_asset_weight < bank.init_asset_weight { - require_group_admin = true; - } + require_group_admin = true; } if let Some(maint_liab_weight) = maint_liab_weight_opt { msg!(