Refactor state

clients/rust/marginfi-cli/src/entrypoint.rs

@@ -12,11 +12,10 @@ use marginfi::state::marginfi_account::TRANSFER_AUTHORITY_ALLOWED_FLAG;
 use marginfi::{
     prelude::*,
     state::{
+        bank::{Bank, BankConfig, BankConfigOpt},
+        interest_rate::{InterestRateConfig, InterestRateConfigOpt},
         marginfi_account::{Balance, LendingAccount, MarginfiAccount, FLASHLOAN_ENABLED_FLAG},
-        marginfi_group::{
-            Bank, BankConfig, BankConfigOpt, BankOperationalState, InterestRateConfig,
-            InterestRateConfigOpt, OracleConfig, RiskTier, WrappedI80F48,
-        },
+        marginfi_group::{BankOperationalState, OracleConfig, RiskTier, WrappedI80F48},
         price::OracleSetup,
     },
 };
@@ -753,7 +752,7 @@ fn bank(subcmd: BankCommand, global_options: &GlobalOptions) -> Result<()> {
         } => {
             let bank = config
                 .mfi_program
-                .account::<marginfi::state::marginfi_group::Bank>(bank_pk)
+                .account::<marginfi::state::bank::Bank>(bank_pk)
                 .unwrap();
             processor::bank_configure(
                 config,
@@ -859,10 +858,7 @@ fn inspect_padding() -> Result<()> {
     println!("MarginfiGroup: {}", MarginfiGroup::type_layout());
     println!("GroupConfig: {}", GroupConfig::type_layout());
     println!("InterestRateConfig: {}", InterestRateConfig::type_layout());
-    println!(
-        "Bank: {}",
-        marginfi::state::marginfi_group::Bank::type_layout()
-    );
+    println!("Bank: {}", marginfi::state::bank::Bank::type_layout());
     println!("BankConfig: {}", BankConfig::type_layout());
     println!("OracleConfig: {}", OracleConfig::type_layout());
     println!("BankConfigOpt: {}", BankConfigOpt::type_layout());
@@ -881,10 +877,7 @@ fn inspect_size() -> Result<()> {
     println!("MarginfiGroup: {}", size_of::<MarginfiGroup>());
     println!("GroupConfig: {}", size_of::<GroupConfig>());
     println!("InterestRateConfig: {}", size_of::<InterestRateConfig>());
-    println!(
-        "Bank: {}",
-        size_of::<marginfi::state::marginfi_group::Bank>()
-    );
+    println!("Bank: {}", size_of::<marginfi::state::bank::Bank>());
     println!("BankConfig: {}", size_of::<BankConfig>());
     println!("OracleConfig: {}", size_of::<OracleConfig>());
     println!("BankConfigOpt: {}", size_of::<BankConfigOpt>());

clients/rust/marginfi-cli/src/processor/admin.rs

@@ -7,7 +7,7 @@ use anchor_spl::associated_token;
 use anyhow::Result;
 use marginfi::{
     bank_authority_seed,
-    state::marginfi_group::{Bank, BankVaultType},
+    state::{bank::Bank, marginfi_group::BankVaultType},
 };
 use solana_sdk::{
     instruction::Instruction, message::Message, pubkey::Pubkey, transaction::Transaction,

clients/rust/marginfi-cli/src/processor/group.rs

@@ -1,7 +1,7 @@
 use crate::{config::Config, profile::Profile, utils};
 use anyhow::Result;
 use log::{debug, info, warn};
-use marginfi::state::marginfi_group::Bank;
+use marginfi::state::bank::Bank;
 use solana_address_lookup_table_program::{
     instruction::{create_lookup_table, extend_lookup_table},
     state::AddressLookupTable,

clients/rust/marginfi-cli/src/processor/mod.rs

@@ -29,11 +29,10 @@ use {
         },
         prelude::*,
         state::{
+            bank::{Bank, BankConfig, BankConfigOpt},
+            interest_rate::InterestRateConfig,
             marginfi_account::{BankAccountWrapper, MarginfiAccount},
-            marginfi_group::{
-                Bank, BankConfig, BankConfigOpt, BankOperationalState, BankVaultType,
-                InterestRateConfig, WrappedI80F48,
-            },
+            marginfi_group::{BankOperationalState, BankVaultType, WrappedI80F48},
             price::{OraclePriceFeedAdapter, OracleSetup, PriceAdapter, PythPushOraclePriceFeed},
         },
         utils::NumTraitsWithTolerance,

clients/rust/marginfi-cli/src/utils.rs

@@ -11,8 +11,9 @@ use {
             PYTH_PUSH_PYTH_SPONSORED_SHARD_ID,
         },
         state::{
+            bank::{Bank, BankConfig},
             marginfi_account::MarginfiAccount,
-            marginfi_group::{Bank, BankConfig, BankVaultType},
+            marginfi_group::BankVaultType,
             price::PythPushOraclePriceFeed,
         },
     },

programs/liquidity-incentive-program/src/instructions/create_campaign.rs

@@ -4,7 +4,7 @@ use crate::{
 };
 use anchor_lang::prelude::*;
 use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
-use marginfi::state::marginfi_group::Bank;
+use marginfi::state::bank::Bank;
 use std::mem::size_of;
 
 pub fn process<'info>(

programs/liquidity-incentive-program/src/instructions/create_deposit.rs

@@ -8,7 +8,7 @@ use anchor_spl::{
     token_2022::{close_account, CloseAccount},
     token_interface::{Mint, TokenAccount, TokenInterface},
 };
-use marginfi::{program::Marginfi, state::marginfi_group::Bank};
+use marginfi::{program::Marginfi, state::bank::Bank};
 use std::mem::size_of;
 
 /// Creates a new deposit in an active liquidity incentive campaign (LIP).

programs/liquidity-incentive-program/src/instructions/end_deposit.rs

@@ -4,7 +4,7 @@ use anchor_spl::{
     token_interface::{Mint, TokenAccount, TokenInterface},
 };
 use fixed::types::I80F48;
-use marginfi::{program::Marginfi, state::marginfi_group::Bank};
+use marginfi::{program::Marginfi, state::bank::Bank};
 
 use crate::{
     constants::{

programs/marginfi/fuzz/fuzz_targets/lend.rs

@@ -6,7 +6,7 @@ use arbitrary::Arbitrary;
 use fixed::types::I80F48;
 use lazy_static::lazy_static;
 use libfuzzer_sys::fuzz_target;
-use marginfi::{assert_eq_with_tolerance, prelude::MarginfiGroup, state::marginfi_group::Bank};
+use marginfi::{assert_eq_with_tolerance, prelude::MarginfiGroup, state::bank::Bank};
 use marginfi_fuzz::{
     account_state::AccountsState, arbitrary_helpers::*, metrics::Metrics, MarginfiFuzzContext,
 };

programs/marginfi/fuzz/src/lib.rs

@@ -24,8 +24,10 @@ use marginfi::{
     instructions::LendingPoolAddBankBumps,
     prelude::MarginfiGroup,
     state::{
+        bank::{Bank, BankConfig},
+        interest_rate::InterestRateConfig,
         marginfi_account::MarginfiAccount,
-        marginfi_group::{Bank, BankConfig, BankVaultType, InterestRateConfig},
+        marginfi_group::BankVaultType,
     },
 };
 use metrics::{MetricAction, Metrics};

programs/marginfi/src/events.rs

@@ -1,4 +1,4 @@
-use crate::{prelude::*, state::marginfi_group::BankConfigOpt};
+use crate::{prelude::*, state::bank::BankConfigOpt};
 use anchor_lang::prelude::*;
 
 // Event headers

programs/marginfi/src/instructions/marginfi_account/borrow.rs

@@ -5,8 +5,10 @@ use crate::{
     math_error,
     prelude::{MarginfiError, MarginfiGroup, MarginfiResult},
     state::{
-        marginfi_account::{BankAccountWrapper, MarginfiAccount, RiskEngine, DISABLED_FLAG},
-        marginfi_group::{Bank, BankVaultType},
+        bank::Bank,
+        marginfi_account::{BankAccountWrapper, MarginfiAccount, DISABLED_FLAG},
+        marginfi_group::BankVaultType,
+        risk_engine::RiskEngine,
     },
     utils::{self, validate_asset_tags},
 };

programs/marginfi/src/instructions/marginfi_account/close_balance.rs

@@ -4,8 +4,8 @@ use crate::{
     check,
     prelude::*,
     state::{
+        bank::Bank,
         marginfi_account::{BankAccountWrapper, MarginfiAccount, DISABLED_FLAG},
-        marginfi_group::Bank,
     },
 };
 

programs/marginfi/src/instructions/marginfi_account/deposit.rs

@@ -4,8 +4,8 @@ use crate::{
     events::{AccountEventHeader, LendingAccountDepositEvent},
     prelude::*,
     state::{
+        bank::Bank,
         marginfi_account::{BankAccountWrapper, MarginfiAccount, DISABLED_FLAG},
-        marginfi_group::Bank,
     },
     utils::{self, validate_asset_tags},
 };

programs/marginfi/src/instructions/marginfi_account/emissions.rs

@@ -9,8 +9,9 @@ use crate::{
     debug,
     prelude::{MarginfiError, MarginfiResult},
     state::{
+        bank::Bank,
         marginfi_account::{BankAccountWrapper, MarginfiAccount, DISABLED_FLAG},
-        marginfi_group::{Bank, MarginfiGroup},
+        marginfi_group::MarginfiGroup,
     },
 };
 

programs/marginfi/src/instructions/marginfi_account/flashloan.rs

@@ -7,7 +7,10 @@ use solana_program::{
 use crate::{
     check,
     prelude::*,
-    state::marginfi_account::{MarginfiAccount, RiskEngine, DISABLED_FLAG, IN_FLASHLOAN_FLAG},
+    state::{
+        marginfi_account::{MarginfiAccount, DISABLED_FLAG},
+        risk_engine::{RiskEngine, IN_FLASHLOAN_FLAG},
+    },
 };
 
 pub fn lending_account_start_flashloan(

programs/marginfi/src/instructions/marginfi_account/liquidate.rs

@@ -2,9 +2,13 @@ use crate::constants::{
     INSURANCE_VAULT_SEED, LIQUIDATION_INSURANCE_FEE, LIQUIDATION_LIQUIDATOR_FEE,
 };
 use crate::events::{AccountEventHeader, LendingAccountLiquidateEvent, LiquidationBalances};
-use crate::state::marginfi_account::{calc_amount, calc_value, RiskEngine};
-use crate::state::marginfi_group::{Bank, BankVaultType};
 use crate::state::price::{OraclePriceFeedAdapter, OraclePriceType, PriceAdapter, PriceBias};
+use crate::state::{
+    bank::Bank,
+    marginfi_account::{calc_amount, calc_value},
+    marginfi_group::BankVaultType,
+    risk_engine::RiskEngine,
+};
 use crate::utils::{validate_asset_tags, validate_bank_asset_tags};
 use crate::{
     bank_signer,

programs/marginfi/src/instructions/marginfi_account/repay.rs

@@ -4,8 +4,8 @@ use crate::{
     events::{AccountEventHeader, LendingAccountRepayEvent},
     prelude::{MarginfiError, MarginfiGroup, MarginfiResult},
     state::{
+        bank::Bank,
         marginfi_account::{BankAccountWrapper, MarginfiAccount, DISABLED_FLAG},
-        marginfi_group::Bank,
     },
     utils,
 };

programs/marginfi/src/instructions/marginfi_account/withdraw.rs

@@ -4,8 +4,10 @@ use crate::{
     events::{AccountEventHeader, LendingAccountWithdrawEvent},
     prelude::*,
     state::{
-        marginfi_account::{BankAccountWrapper, MarginfiAccount, RiskEngine, DISABLED_FLAG},
-        marginfi_group::{Bank, BankVaultType},
+        bank::Bank,
+        marginfi_account::{BankAccountWrapper, MarginfiAccount, DISABLED_FLAG},
+        marginfi_group::BankVaultType,
+        risk_engine::RiskEngine,
     },
     utils,
 };

programs/marginfi/src/instructions/marginfi_group/accrue_bank_interest.rs

@@ -1,5 +1,5 @@
 use crate::{
-    state::marginfi_group::{Bank, MarginfiGroup},
+    state::{bank::Bank, marginfi_group::MarginfiGroup},
     MarginfiResult,
 };
 use anchor_lang::prelude::*;

programs/marginfi/src/instructions/marginfi_group/add_pool.rs

@@ -7,8 +7,9 @@ use crate::{
     },
     events::{GroupEventHeader, LendingPoolBankCreateEvent},
     state::{
+        bank::{Bank, BankConfig, BankConfigCompact},
         fee_state::FeeState,
-        marginfi_group::{Bank, BankConfig, BankConfigCompact, MarginfiGroup},
+        marginfi_group::MarginfiGroup,
     },
     MarginfiError, MarginfiResult,
 };

programs/marginfi/src/instructions/marginfi_group/add_pool_permissionless.rs

@@ -9,9 +9,9 @@ use crate::{
     },
     events::{GroupEventHeader, LendingPoolBankCreateEvent},
     state::{
-        marginfi_group::{
-            Bank, BankConfigCompact, BankOperationalState, InterestRateConfig, MarginfiGroup,
-        },
+        bank::{Bank, BankConfigCompact},
+        interest_rate::InterestRateConfig,
+        marginfi_group::{BankOperationalState, MarginfiGroup},
         price::OracleSetup,
         staked_settings::StakedSettings,
     },

programs/marginfi/src/instructions/marginfi_group/add_pool_with_seed.rs

@@ -7,8 +7,9 @@ use crate::{
     },
     events::{GroupEventHeader, LendingPoolBankCreateEvent},
     state::{
+        bank::{Bank, BankConfig, BankConfigCompact},
         fee_state::FeeState,
-        marginfi_group::{Bank, BankConfig, BankConfigCompact, MarginfiGroup},
+        marginfi_group::MarginfiGroup,
     },
     MarginfiError, MarginfiResult,
 };

programs/marginfi/src/instructions/marginfi_group/collect_bank_fees.rs

@@ -7,7 +7,10 @@ use crate::{
         FEE_VAULT_SEED, INSURANCE_VAULT_SEED, LIQUIDITY_VAULT_AUTHORITY_SEED, LIQUIDITY_VAULT_SEED,
     },
     math_error,
-    state::marginfi_group::{Bank, BankVaultType, MarginfiGroup},
+    state::{
+        bank::Bank,
+        marginfi_group::{BankVaultType, MarginfiGroup},
+    },
     MarginfiResult,
 };
 use crate::{check, utils, MarginfiError};

programs/marginfi/src/instructions/marginfi_group/configure.rs

@@ -107,8 +107,11 @@ pub struct UnsetAccountFlag<'info> {
 
 #[cfg(test)]
 mod tests {
-    use crate::state::marginfi_account::{
-        DISABLED_FLAG, FLASHLOAN_ENABLED_FLAG, IN_FLASHLOAN_FLAG, TRANSFER_AUTHORITY_ALLOWED_FLAG,
+    use crate::state::{
+        marginfi_account::{
+            DISABLED_FLAG, FLASHLOAN_ENABLED_FLAG, TRANSFER_AUTHORITY_ALLOWED_FLAG,
+        },
+        risk_engine::IN_FLASHLOAN_FLAG,
     };
 
     #[test]

programs/marginfi/src/instructions/marginfi_group/configure_bank.rs

@@ -5,7 +5,10 @@ use crate::events::{
 use crate::prelude::MarginfiError;
 use crate::{check, math_error, utils};
 use crate::{
-    state::marginfi_group::{Bank, BankConfigOpt, MarginfiGroup},
+    state::{
+        bank::{Bank, BankConfigOpt},
+        marginfi_group::MarginfiGroup,
+    },
     MarginfiResult,
 };
 use anchor_lang::prelude::*;

programs/marginfi/src/instructions/marginfi_group/handle_bankruptcy.rs

@@ -9,8 +9,10 @@ use crate::{
     math_error,
     prelude::MarginfiError,
     state::{
-        marginfi_account::{BankAccountWrapper, MarginfiAccount, RiskEngine, DISABLED_FLAG},
-        marginfi_group::{Bank, BankVaultType, MarginfiGroup},
+        bank::Bank,
+        marginfi_account::{BankAccountWrapper, MarginfiAccount, DISABLED_FLAG},
+        marginfi_group::{BankVaultType, MarginfiGroup},
+        risk_engine::RiskEngine,
     },
     utils, MarginfiResult,
 };

programs/marginfi/src/instructions/marginfi_group/propagate_staked_settings.rs

@@ -1,7 +1,6 @@
 use crate::constants::ASSET_TAG_STAKED;
 // Permissionless ix to propagate a group's staked collateral settings to any bank in that group
-use crate::state::marginfi_group::Bank;
-use crate::state::staked_settings::StakedSettings;
+use crate::state::{bank::Bank, staked_settings::StakedSettings};
 use crate::MarginfiGroup;
 use anchor_lang::prelude::*;
 

programs/marginfi/src/lib.rs

@@ -10,8 +10,10 @@ pub mod utils;
 use anchor_lang::prelude::*;
 use instructions::*;
 use prelude::*;
-use state::marginfi_group::WrappedI80F48;
-use state::marginfi_group::{BankConfigCompact, BankConfigOpt};
+use state::{
+    bank::{BankConfigCompact, BankConfigOpt},
+    marginfi_group::WrappedI80F48,
+};
 
 cfg_if::cfg_if! {
     if #[cfg(feature = "mainnet-beta")] {