project-serum
/
swap
mirror of https://github.com/project-serum/swap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

stash

This commit is contained in:
armaniferrante 2021-06-02 00:32:07 -07:00
parent 830d087cf0
commit a7ccf5afc6
No known key found for this signature in database
GPG Key ID: 58BEF301E91F7828
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
programs/swap/src/lib.rs
View File

@ -198,17 +198,17 @@ pub mod swap {
fn apply_risk_checks<'info>(event: DidSwap) -> Result<()> { fn apply_risk_checks<'info>(event: DidSwap) -> Result<()> {
emit!(event); emit!(event);
let spill_deduction = {
if event.spill_amount == 0 || event.min_exchange_rate.strict {
0
} else {
(event.from_amount.checked_mul(event.spill_amount).unwrap())
.checked_div(event.quote_amount)
.unwrap()
}
};
let (to_amount, min_expected_amount) = { let (to_amount, min_expected_amount) = {
// If there is spill (i.e. quote tokens *not* fully consumed)
let spill_deduction = {
if event.spill_amount == 0 || event.min_exchange_rate.strict {
0
} else {
(event.from_amount.checked_mul(event.spill_amount).unwrap())
.checked_div(event.quote_amount)
.unwrap()
}
};
// Use the exchange rate to calculate the client's expectation. // Use the exchange rate to calculate the client's expectation.
// This number has // This number has
// //
@ -618,8 +618,6 @@ pub struct ExchangeRate {
rate: u64, rate: u64,
// Number of decimals of the *from* token's mint. // Number of decimals of the *from* token's mint.
decimals: u8, decimals: u8,
// Number opf decimals of the *quote* token for a transitive swap.
quote_decimals: u8,
// True if *all* of the *from* currency sold should be used when calculating // True if *all* of the *from* currency sold should be used when calculating
// the executed exchange rate. // the executed exchange rate.
// //