Freeze bank settings (#261)

* Fix a bug where config doesn't update the protocol origination fee

* Enable freezing of bank settings

.github/actions/setup-common/action.yaml

@@ -18,5 +18,8 @@ runs:
         components: rustfmt, clippy
         default: true
 
-    - run: (cargo install cargo-nextest || true)
+    - run: cargo install cargo-nextest --locked
+      shell: bash
+
+    - run: cargo nextest --version
       shell: bash

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

@@ -304,6 +304,11 @@ pub enum BankCommand {
             help = "Permissionless bad debt settlement, if true the group admin is not required to settle bad debt"
         )]
         permissionless_bad_debt_settlement: Option<bool>,
+        #[clap(
+            long,
+            help = "If enabled, will prevent this Update ix from ever running against after this invokation"
+        )]
+        freeze_settings: Option<bool>,
     },
     InspectPriceOracle {
         bank_pk: Pubkey,
@@ -740,6 +745,7 @@ fn bank(subcmd: BankCommand, global_options: &GlobalOptions) -> Result<()> {
             usd_init_limit,
             oracle_max_age,
             permissionless_bad_debt_settlement,
+            freeze_settings,
         } => {
             let bank = config
                 .mfi_program
@@ -789,6 +795,7 @@ fn bank(subcmd: BankCommand, global_options: &GlobalOptions) -> Result<()> {
                     total_asset_value_init_limit: usd_init_limit,
                     oracle_max_age,
                     permissionless_bad_debt_settlement,
+                    freeze_settings,
                 },
             )
         }

package.json

@@ -8,8 +8,8 @@
     "@coral-xyz/spl-token": "^0.30.1",
     "@solana/spl-token": "^0.4.8",
     "@solana/web3.js": "^1.95.2",
-    "@mrgnlabs/mrgn-common": "^1.7.0",
-    "@mrgnlabs/marginfi-client-v2": "^3.1.0",
+    "@mrgnlabs/mrgn-common": "^1.8.0",
+    "@mrgnlabs/marginfi-client-v2": "^4.0.0",
     "mocha": "^10.2.0",
     "ts-mocha": "^10.0.0",
     "bignumber.js": "^9.1.2"

programs/marginfi/src/constants.rs

@@ -77,9 +77,10 @@ pub const ZERO_AMOUNT_THRESHOLD: I80F48 = I80F48!(0.0001);
 pub const EMISSIONS_FLAG_BORROW_ACTIVE: u64 = 1 << 0;
 pub const EMISSIONS_FLAG_LENDING_ACTIVE: u64 = 1 << 1;
 pub const PERMISSIONLESS_BAD_DEBT_SETTLEMENT_FLAG: u64 = 1 << 2;
+pub const FREEZE_SETTINGS: u64 = 1 << 3;
 
 pub(crate) const EMISSION_FLAGS: u64 = EMISSIONS_FLAG_BORROW_ACTIVE | EMISSIONS_FLAG_LENDING_ACTIVE;
-pub(crate) const GROUP_FLAGS: u64 = PERMISSIONLESS_BAD_DEBT_SETTLEMENT_FLAG;
+pub(crate) const GROUP_FLAGS: u64 = PERMISSIONLESS_BAD_DEBT_SETTLEMENT_FLAG | FREEZE_SETTINGS;
 
 /// Cutoff timestamp for balance last_update used in accounting collected emissions.
 /// Any balance updates before this timestamp are ignored, and current_timestamp is used instead.

programs/marginfi/src/errors.rs

@@ -98,6 +98,8 @@ pub enum MarginfiError {
     T22MintRequired,
     #[msg("Invalid ATA for global fee account")] // 6048
     InvalidFeeAta,
+    #[msg("Bank settings are frozen and cannot be updated")] // 6049
+    BankSettingsFrozen,
 }
 
 impl From<MarginfiError> for ProgramError {

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

@@ -1,4 +1,4 @@
-use crate::constants::{EMISSIONS_AUTH_SEED, EMISSIONS_TOKEN_ACCOUNT_SEED};
+use crate::constants::{EMISSIONS_AUTH_SEED, EMISSIONS_TOKEN_ACCOUNT_SEED, FREEZE_SETTINGS};
 use crate::events::{GroupEventHeader, LendingPoolBankConfigureEvent};
 use crate::prelude::MarginfiError;
 use crate::{check, math_error, utils};
@@ -17,6 +17,11 @@ pub fn lending_pool_configure_bank(
 ) -> MarginfiResult {
     let mut bank = ctx.accounts.bank.load_mut()?;
 
+    check!(
+        !bank.get_flag(FREEZE_SETTINGS),
+        MarginfiError::BankSettingsFrozen
+    );
+
     bank.configure(&bank_config)?;
 
     if bank_config.oracle.is_some() {

programs/marginfi/src/state/marginfi_group.rs

@@ -2,7 +2,6 @@ use super::{
     marginfi_account::{BalanceSide, RequirementType},
     price::{OraclePriceFeedAdapter, OracleSetup},
 };
-use crate::borsh::{BorshDeserialize, BorshSerialize};
 #[cfg(not(feature = "client"))]
 use crate::events::{GroupEventHeader, LendingPoolBankAccrueInterestEvent};
 use crate::{
@@ -20,6 +19,10 @@ use crate::{
     state::marginfi_account::calc_value,
     MarginfiResult,
 };
+use crate::{
+    borsh::{BorshDeserialize, BorshSerialize},
+    constants::FREEZE_SETTINGS,
+};
 use anchor_lang::prelude::borsh;
 use anchor_lang::prelude::*;
 use anchor_spl::token_interface::*;
@@ -269,6 +272,10 @@ impl InterestRateConfig {
             ir_config.protocol_fixed_fee_apr
         );
         set_if_some!(self.protocol_ir_fee, ir_config.protocol_ir_fee);
+        set_if_some!(
+            self.protocol_origination_fee,
+            ir_config.protocol_origination_fee
+        );
     }
 }
 
@@ -706,6 +713,10 @@ impl Bank {
             self.update_flag(flag, PERMISSIONLESS_BAD_DEBT_SETTLEMENT_FLAG);
         }
 
+        if let Some(flag) = config.freeze_settings {
+            self.update_flag(flag, FREEZE_SETTINGS);
+        }
+
         self.config.validate()?;
 
         Ok(())
@@ -1494,6 +1505,8 @@ pub struct BankConfigOpt {
     pub oracle_max_age: Option<u16>,
 
     pub permissionless_bad_debt_settlement: Option<bool>,
+
+    pub freeze_settings: Option<bool>,
 }
 
 #[cfg_attr(

programs/marginfi/tests/admin_actions/setup_bank.rs

@@ -2,7 +2,9 @@ use fixed::types::I80F48;
 use fixed_macro::types::I80F48;
 use fixtures::{assert_custom_error, prelude::*};
 use marginfi::{
-    constants::{INIT_BANK_ORIGINATION_FEE_DEFAULT, PERMISSIONLESS_BAD_DEBT_SETTLEMENT_FLAG},
+    constants::{
+        FREEZE_SETTINGS, INIT_BANK_ORIGINATION_FEE_DEFAULT, PERMISSIONLESS_BAD_DEBT_SETTLEMENT_FLAG,
+    },
     prelude::MarginfiError,
     state::marginfi_group::{Bank, BankConfig, BankConfigOpt, BankVaultType},
 };
@@ -344,6 +346,7 @@ async fn configure_bank_success(bank_mint: BankMint) -> anyhow::Result<()> {
         total_asset_value_init_limit,
         oracle_max_age,
         permissionless_bad_debt_settlement,
+        freeze_settings,
     } = &config_bank_opt;
     // Compare bank field to opt field if Some, otherwise compare to old bank field
     macro_rules! check_bank_field {
@@ -374,6 +377,7 @@ async fn configure_bank_success(bank_mint: BankMint) -> anyhow::Result<()> {
         check_bank_field!(interest_rate_config, insurance_ir_fee);
         check_bank_field!(interest_rate_config, protocol_fixed_fee_apr);
         check_bank_field!(interest_rate_config, protocol_ir_fee);
+        check_bank_field!(interest_rate_config, protocol_origination_fee);
 
         check_bank_field!(asset_weight_init);
         check_bank_field!(asset_weight_maint);
@@ -395,6 +399,13 @@ async fn configure_bank_success(bank_mint: BankMint) -> anyhow::Result<()> {
             .unwrap_or( bank.get_flag(PERMISSIONLESS_BAD_DEBT_SETTLEMENT_FLAG) == old_bank.get_flag(PERMISSIONLESS_BAD_DEBT_SETTLEMENT_FLAG))
         );
 
+        assert!(freeze_settings
+            // If Some(...) check flag set properly
+            .map(|set| set == bank.get_flag(FREEZE_SETTINGS))
+            // If None check flag is unchanged
+            .unwrap_or( bank.get_flag(FREEZE_SETTINGS) == old_bank.get_flag(FREEZE_SETTINGS))
+        );
+
         assert_eq!(
             bank.config.oracle_keys,
             // If Some(...) check keys set properly

tests/01_initGroup.spec.ts

@@ -24,7 +24,7 @@ describe("Init group", () => {
       })
     );
 
-    await groupAdmin.userMarginProgram.provider.sendAndConfirm(tx, [
+    await groupAdmin.mrgnProgram.provider.sendAndConfirm(tx, [
       marginfiGroup,
     ]);
 

tests/02_configGroup.spec.ts

@@ -15,7 +15,7 @@ describe("Config group", () => {
   const program = workspace.Marginfi as Program<Marginfi>;
 
   it("(admin) Config group - no change", async () => {
-    await groupAdmin.userMarginProgram!.provider.sendAndConfirm!(
+    await groupAdmin.mrgnProgram!.provider.sendAndConfirm!(
       new Transaction().add(
         await groupConfigure(program, {
           newAdmin: null,
@@ -33,7 +33,7 @@ describe("Config group", () => {
 
   it("(admin) Config group - set new admin", async () => {
     let newAdmin = Keypair.generate();
-    await groupAdmin.userMarginProgram!.provider.sendAndConfirm!(
+    await groupAdmin.mrgnProgram!.provider.sendAndConfirm!(
       new Transaction().add(
         await groupConfigure(program, {
           newAdmin: newAdmin.publicKey,
@@ -49,7 +49,7 @@ describe("Config group", () => {
     assertKeysEqual(group.admin, newAdmin.publicKey);
 
     // Restore original
-    await groupAdmin.userMarginProgram!.provider.sendAndConfirm!(
+    await groupAdmin.mrgnProgram!.provider.sendAndConfirm!(
       new Transaction().add(
         await groupConfigure(program, {
           newAdmin: groupAdmin.wallet.publicKey,

tests/03_addBank.spec.ts

@@ -31,7 +31,6 @@ import {
 } from "./utils/pdas";
 import { assert } from "chai";
 import { printBufferGroups } from "./utils/tools";
-import { wrappedI80F48toBigNumber } from "@mrgnlabs/mrgn-common";
 
 describe("Lending pool add bank (add bank to group)", () => {
   const program = workspace.Marginfi as Program<Marginfi>;
@@ -45,7 +44,7 @@ describe("Lending pool add bank (add bank to group)", () => {
       globalFeeWallet
     );
 
-    await groupAdmin.userMarginProgram!.provider.sendAndConfirm!(
+    await groupAdmin.mrgnProgram!.provider.sendAndConfirm!(
       new Transaction().add(
         await addBank(program, {
           marginfiGroup: marginfiGroup.publicKey,
@@ -127,7 +126,7 @@ describe("Lending pool add bank (add bank to group)", () => {
     assertI80F48Equal(config.assetWeightInit, 1);
     assertI80F48Equal(config.assetWeightMaint, 1);
     assertI80F48Equal(config.liabilityWeightInit, 1);
-    assertBNEqual(config.depositLimit, 1_000_000_000);
+    assertBNEqual(config.depositLimit, 100_000_000_000);
 
     const tolerance = 0.000001;
     assertI80F48Approx(interest.optimalUtilizationRate, 0.5, tolerance);
@@ -138,12 +137,13 @@ describe("Lending pool add bank (add bank to group)", () => {
     assertI80F48Approx(interest.insuranceIrFee, 0.02, tolerance);
     assertI80F48Approx(interest.protocolFixedFeeApr, 0.03, tolerance);
     assertI80F48Approx(interest.protocolIrFee, 0.04, tolerance);
+    assertI80F48Approx(interest.protocolOriginationFee, 0.01, tolerance);
 
     assert.deepEqual(config.operationalState, { operational: {} });
     assert.deepEqual(config.oracleSetup, { pythLegacy: {} });
-    assertBNEqual(config.borrowLimit, 1_000_000_000);
+    assertBNEqual(config.borrowLimit, 100_000_000_000);
     assert.deepEqual(config.riskTier, { collateral: {} });
-    assertBNEqual(config.totalAssetValueInitLimit, 100_000_000_000);
+    assertBNEqual(config.totalAssetValueInitLimit, 1_000_000_000_000);
     assert.equal(config.oracleMaxAge, 100);
 
     assertI80F48Equal(bank.collectedProgramFeesOutstanding, 0);
@@ -153,7 +153,7 @@ describe("Lending pool add bank (add bank to group)", () => {
     let config = defaultBankConfig(oracles.tokenAOracle.publicKey);
     let bankKey = bankKeypairA.publicKey;
 
-    await groupAdmin.userMarginProgram!.provider.sendAndConfirm!(
+    await groupAdmin.mrgnProgram!.provider.sendAndConfirm!(
       new Transaction().add(
         await addBank(program, {
           marginfiGroup: marginfiGroup.publicKey,
@@ -176,7 +176,6 @@ describe("Lending pool add bank (add bank to group)", () => {
   it("Decodes a mainnet bank configured before manual padding", async () => {
     // mainnet program ID
     const id = new PublicKey("MFv2hWf31Z9kbCa1snEPYctwafyhdvnV7FZnsebVacA");
-    const tolerance = 0.000001;
     const group = new PublicKey("4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8");
 
     let bonkBankKey = new PublicKey(