blockworks-foundation
/
mango-v4
mirror of https://github.com/blockworks-foundation/mango-v4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix serum3 loan origination fee withdrawal 

Paying the loan origination fee must be like a withdrawal and can't be
charged as a borrow if the user has deposits.
This commit is contained in:
Christian Kamm 2022-07-07 12:33:21 +02:00
parent 45da68c6ac
commit 9f90c3982f
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/mango-v4/src/instructions/serum3_settle_funds.rs
View File

@ -195,7 +195,7 @@ pub fn charge_maybe_fees(
// charge the loan origination fee
coin_bank
.borrow_mut()
.charge_loan_origination_fee(coin_token_account, actualized_loan)?;
.withdraw_loan_origination_fee(coin_token_account, actualized_loan)?;
}
}
@ -219,7 +219,7 @@ pub fn charge_maybe_fees(
// charge the loan origination fee
pc_bank
.borrow_mut()
.charge_loan_origination_fee(pc_token_account, actualized_loan)?;
.withdraw_loan_origination_fee(pc_token_account, actualized_loan)?;
}
}

16
programs/mango-v4/src/state/bank.rs
View File

@ -320,7 +320,9 @@ impl Bank {
}
if with_loan_origination_fee {
self.charge_loan_origination_fee(position, native_amount)?;
let loan_origination_fee = cm!(self.loan_origination_fee_rate * native_amount);
self.collected_fees_native = cm!(self.collected_fees_native + loan_origination_fee);
native_amount = cm!(native_amount + loan_origination_fee);
}
// add to borrows
@ -331,21 +333,17 @@ impl Bank {
Ok(true)
}
// charge only loan origination fee, assuming borrow has already happened
pub fn charge_loan_origination_fee(
// withdraw the loan origination fee for a borrow that happenend earlier
pub fn withdraw_loan_origination_fee(
&mut self,
position: &mut TokenPosition,
already_borrowed_native_amount: I80F48,
) -> Result<()> {
) -> Result<bool> {
let loan_origination_fee =
cm!(self.loan_origination_fee_rate * already_borrowed_native_amount);
self.collected_fees_native = cm!(self.collected_fees_native + loan_origination_fee);
let indexed_change = cm!(loan_origination_fee / self.borrow_index);
self.indexed_borrows = cm!(self.indexed_borrows + indexed_change);
position.indexed_position = cm!(position.indexed_position - indexed_change);
Ok(())
self.withdraw_internal(position, loan_origination_fee, false)
}
/// Change a position without applying the loan origination fee