Remove ignore fee deploy feature (#298)

* Removes ignore-fee-deploy feature flag --------- Co-authored-by: lastemp <[email protected]>
mrgnlabs · Feb 11, 2025 · f258b4e · f258b4e
1 parent f1384c4
commit f258b4e
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 16 deletions.
diff --git a/DEPLOY_GUIDE_STAGING.md b/DEPLOY_GUIDE_STAGING.md
@@ -14,7 +14,7 @@ Staging is different from mainnet only in that it uses a different key. Ensure t
 
 * Note: this rarely works, the program is probably too chonky.
 * Build with `anchor build -p marginfi -- --no-default-features --features staging`
-* If this is your first time deploying (to a new key), with `anchor build -p marginfi -- --no-default-features --features staging ignore-fee-deploy`
+* If this is your first time deploying (to a new key), with `anchor build -p marginfi -- --no-default-features --features staging`
 * Ensure anchor.toml is configured like this: 
 ```
 [provider]

diff --git a/programs/brick/Cargo.toml b/programs/brick/Cargo.toml
@@ -15,7 +15,6 @@ cpi = ["no-entrypoint"]
 default = []
 idl-build = ["anchor-lang/idl-build"]
 test = []
-ignore-fee-deploy = []
 
 [dependencies]
 # Remove workspace = true if already defined in the root Cargo.toml

diff --git a/programs/liquidity-incentive-program/Cargo.toml b/programs/liquidity-incentive-program/Cargo.toml
@@ -19,7 +19,6 @@ devnet = ["marginfi/devnet"]
 mainnet-beta = ["marginfi/mainnet-beta"]
 test = []
 test-bpf = []
-ignore-fee-deploy = []
 
 [dependencies]
 anchor-lang = { workspace = true }

diff --git a/programs/marginfi/Cargo.toml b/programs/marginfi/Cargo.toml
@@ -22,7 +22,6 @@ devnet = []
 mainnet-beta = []
 debug = []
 staging = []
-ignore-fee-deploy = []
 
 [dependencies]
 solana-program = { workspace = true }

diff --git a/programs/marginfi/fuzz/Cargo.toml b/programs/marginfi/fuzz/Cargo.toml
@@ -48,7 +48,7 @@ capture_log = ["log", "log4rs"]
 
 [dependencies.marginfi]
 path = ".."
-features = ["no-entrypoint", "debug", "client", "ignore-fee-deploy"]
+features = ["no-entrypoint", "debug", "client"]
 
 # Prevent this from interfering with workspaces
 [workspace]

diff --git a/programs/marginfi/src/instructions/marginfi_group/init_global_fee_state.rs b/programs/marginfi/src/instructions/marginfi_group/init_global_fee_state.rs
@@ -15,13 +15,6 @@ pub fn initialize_fee_state(
     program_fee_rate: WrappedI80F48,
 ) -> Result<()> {
     let mut fee_state = ctx.accounts.fee_state.load_init()?;
-    cfg_if::cfg_if! {
-        if #[cfg(all(feature = "mainnet-beta", not(feature = "ignore-fee-deploy")))] {
-            if ctx.accounts.payer.key != &pubkey!("3HGdGLrnK9DsnHi1mCrUMLGfQHcu6xUrXhMY14GYjqvM") {
-                panic!("The mrgn program multisig must sign on mainnet.");
-            }
-        }
-    }
     fee_state.global_fee_admin = admin_key;
     fee_state.global_fee_wallet = fee_wallet;
     fee_state.key = ctx.accounts.fee_state.key();

diff --git a/programs/mocks/Cargo.toml b/programs/mocks/Cargo.toml
@@ -22,7 +22,6 @@ devnet = []
 mainnet-beta = []
 debug = []
 staging = []
-ignore-fee-deploy = []
 
 [dependencies]
 anchor-lang = { workspace = true }

diff --git a/programs/test_transfer_hook/Cargo.toml b/programs/test_transfer_hook/Cargo.toml
@@ -6,7 +6,6 @@ edition = "2021"
 [features]
 idl-build = []
 no-entrypoint = []
-ignore-fee-deploy = []
 
 [lib]
 crate-type = ["cdylib", "lib"]

diff --git a/scripts/build-program.sh b/scripts/build-program.sh
@@ -21,6 +21,6 @@ else
     exit 1
 fi
 
-cmd="anchor build -p $program_lib_name -- $features ignore-fee-deploy"
+cmd="anchor build -p $program_lib_name -- $features"
 echo "Running: $cmd"
 eval "$cmd"
diff --git a/scripts/build-workspace.sh b/scripts/build-workspace.sh
@@ -2,6 +2,6 @@
 ROOT=$(git rev-parse --show-toplevel)
 cd $ROOT
 
-cmd="anchor build --no-idl -- --features ignore-fee-deploy"
+cmd="anchor build --no-idl -- --features"
 echo "Running: $cmd"
 eval "$cmd"