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

Perp: Add PerpOpenOrder::is_active_for_market()

This commit is contained in:
Christian Kamm 2023-01-20 13:47:01 +01:00
parent 30ebf173ee
commit be37f33946
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/mango-v4/src/state/mango_account.rs
View File

@ -551,7 +551,7 @@ impl<
client_order_id: u64,
) -> Option<&PerpOpenOrder> {
self.all_perp_orders()
.find(|&oo| oo.market == market_index && oo.client_id == client_order_id)
.find(|&oo| oo.is_active_for_market(market_index) && oo.client_id == client_order_id)
}
pub fn perp_find_order_with_order_id(
@ -560,7 +560,7 @@ impl<
order_id: u128,
) -> Option<&PerpOpenOrder> {
self.all_perp_orders()
.find(|&oo| oo.market == market_index && oo.id == order_id)
.find(|&oo| oo.is_active_for_market(market_index) && oo.id == order_id)
}
pub fn being_liquidated(&self) -> bool {

4
programs/mango-v4/src/state/mango_account_components.rs
View File

@ -767,6 +767,10 @@ impl PerpOpenOrder {
pub fn side_and_tree(&self) -> SideAndOrderTree {
SideAndOrderTree::try_from(self.side_and_tree).unwrap()
}
pub fn is_active_for_market(&self, perp_market_index: PerpMarketIndex) -> bool {
self.market == perp_market_index
}
}
#[macro_export]

4
programs/mango-v4/src/state/orderbook/book.rs
View File

@ -1,7 +1,7 @@
use crate::state::MangoAccountRefMut;
use crate::{
error::*,
state::{orderbook::bookside::*, EventQueue, PerpMarket, FREE_ORDER_SLOT},
state::{orderbook::bookside::*, EventQueue, PerpMarket},
};
use anchor_lang::prelude::*;
use bytemuck::cast;
@ -280,7 +280,7 @@ impl<'a> Orderbook<'a> {
) -> Result<()> {
for i in 0..mango_account.header.perp_oo_count() {
let oo = mango_account.perp_order_by_raw_index(i);
if oo.market == FREE_ORDER_SLOT || oo.market != perp_market.perp_market_index {
if !oo.is_active_for_market(perp_market.perp_market_index) {
continue;
}