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

fix: stable market tiers (#217)

This commit is contained in:
Pierre 2022-02-15 02:33:44 +11:00 committed by GitHub
parent 4258756cf7
commit 4d0a8dcdbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dex/src/fees.rs
View File

@ -90,7 +90,7 @@ impl FeeTier {
pub fn from_srm_and_msrm_balances(market: &Pubkey, srm_held: u64, msrm_held: u64) -> FeeTier {
let one_srm = 1_000_000;
if market == &stable_markets::usdt_usdc::ID || market == &stable_markets::msol_sol::ID {
if market == &stable_markets::usdt_usdc::ID || market == &stable_markets::msol_sol::ID || market == &stable_markets::ust_usdc::ID || market == &stable_markets::ust_usdt::ID || market == &stable_markets::stsol_sol::ID {
return FeeTier::Stable;
}

5
dex/src/state.rs
View File

@ -537,9 +537,10 @@ impl MarketState {
expected_owner: &[u64; 4],
srm_or_msrm_account: Option<account_parser::TokenAccount>,
) -> DexResult<FeeTier> {
let market_addr = self.pubkey();
let srm_or_msrm_account = match srm_or_msrm_account {
Some(a) => a,
None => return Ok(FeeTier::Base),
None => return Ok(FeeTier::from_srm_and_msrm_balances(&market_addr, 0, 0)),
};
let data = srm_or_msrm_account.inner().try_borrow_data()?;
@ -547,8 +548,6 @@ impl MarketState {
bytes_of_mut(&mut aligned_data).copy_from_slice(&data[..72]);
let (mint, owner, &[balance]) = array_refs![&aligned_data, 4, 4, 1];
let market_addr = self.pubkey();
check_assert_eq!(owner, expected_owner)?;
if mint == &srm_token::ID.to_aligned_bytes() {
return Ok(FeeTier::from_srm_and_msrm_balances(