Origination fees on borrow

README.md

@@ -76,14 +76,12 @@ use an x86 toolchain when compiling and running the tests.
 
 ## Rust Tests
 
-Run the full test suite with `.scripts/test-program.sh <program_to_test>`
-
-- e.g. `.scripts/test-program.sh all --sane`
+Run the full test suite with `./scripts/test-program.sh <program_to_test>`
+* e.g. `./scripts/test-program.sh all --sane`
 
 Run a single test:
-`.scripts/test-program.sh <program_to_test> <name_of_test>`
-
-- e.g. `.scripts/test-program.sh marginfi configure_bank_success --verbose`
+`./scripts/test-program.sh <program_to_test> <name_of_test>`
+* e.g. `./scripts/test-program.sh marginfi configure_bank_success --verbose`
 
 ## Localnet Anchor Tests
 

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

@@ -249,6 +249,8 @@ pub enum BankCommand {
         pf_fa: Option<f64>,
         #[clap(long, help = "Protocol IR fee")]
         pf_ir: Option<f64>,
+        #[clap(long, help = "Protocol origination fee")]
+        pf_or: Option<f64>,
         #[clap(long, arg_enum, help = "Bank risk tier")]
         risk_tier: Option<RiskTierArg>,
         #[clap(long, arg_enum, help = "Bank oracle type")]
@@ -649,6 +651,7 @@ fn bank(subcmd: BankCommand, global_options: &GlobalOptions) -> Result<()> {
             if_ir,
             pf_fa,
             pf_ir,
+            pf_or,
             risk_tier,
             oracle_type,
             oracle_key,
@@ -698,6 +701,7 @@ fn bank(subcmd: BankCommand, global_options: &GlobalOptions) -> Result<()> {
                         insurance_ir_fee: if_ir.map(|x| I80F48::from_num(x).into()),
                         protocol_fixed_fee_apr: pf_fa.map(|x| I80F48::from_num(x).into()),
                         protocol_ir_fee: pf_ir.map(|x| I80F48::from_num(x).into()),
+                        protocol_origination_fee: pf_or.map(|x| I80F48::from_num(x).into()),
                     }),
                     risk_tier: risk_tier.map(|x| x.into()),
                     total_asset_value_init_limit: usd_init_limit,

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

@@ -2095,6 +2095,7 @@ pub fn marginfi_account_borrow(
                 &config.program_id,
             )
             .0,
+            fee_vault: find_bank_vault_pda(&bank_pk, BankVaultType::Fee, &config.program_id).0,
         }
         .to_account_metas(Some(true)),
         data: marginfi::instruction::LendingAccountBorrow { amount }.data(),

programs/marginfi/fuzz/src/lib.rs

@@ -635,6 +635,7 @@ impl<'state> MarginfiFuzzContext<'state> {
                     ))?,
                     bank_liquidity_vault_authority: ails(bank.liquidity_vault_authority.clone()),
                     bank_liquidity_vault: InterfaceAccount::try_from(airls(&bank.liquidity_vault))?,
+                    fee_vault: InterfaceAccount::try_from(airls(&bank.fee_vault))?,
                 },
                 aisls(&remaining_accounts),
                 Default::default(),

programs/marginfi/src/events.rs

@@ -105,7 +105,8 @@ pub struct LendingAccountBorrowEvent {
     pub header: AccountEventHeader,
     pub bank: Pubkey,
     pub mint: Pubkey,
-    pub amount: u64,
+    pub amount_pre_fee: u64,
+    pub fee: u64,
 }
 
 #[event]