remove event heap fee

openbook-dex · Dec 26, 2023 · 32b14c6 · 32b14c6
1 parent b728fe2
commit 32b14c6
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 20 deletions.
diff --git a/programs/openbook-v2/src/instructions/cancel_all_and_place_orders.rs b/programs/openbook-v2/src/instructions/cancel_all_and_place_orders.rs
@@ -29,7 +29,6 @@ pub fn cancel_all_and_place_orders(
         asks: ctx.accounts.asks.load_mut()?,
     };
     let mut event_heap = ctx.accounts.event_heap.load_mut()?;
-    let event_heap_size_before = event_heap.len();
 
     let now_ts: u64 = clock.unix_timestamp.try_into().unwrap();
 
@@ -126,10 +125,6 @@ pub fn cancel_all_and_place_orders(
     market.base_deposit_total += deposit_base_amount;
     market.quote_deposit_total += deposit_quote_amount;
 
-    if event_heap.len() > event_heap_size_before {
-        position.penalty_heap_count += 1;
-    }
-
     token_transfer(
         deposit_quote_amount,
         &ctx.accounts.token_program,

diff --git a/programs/openbook-v2/src/instructions/place_order.rs b/programs/openbook-v2/src/instructions/place_order.rs
@@ -37,7 +37,6 @@ pub fn place_order(ctx: Context<PlaceOrder>, order: Order, limit: u8) -> Result<
         asks: ctx.accounts.asks.load_mut()?,
     };
     let mut event_heap = ctx.accounts.event_heap.load_mut()?;
-    let event_heap_size_before = event_heap.len();
 
     let now_ts: u64 = clock.unix_timestamp.try_into().unwrap();
 
@@ -100,10 +99,6 @@ pub fn place_order(ctx: Context<PlaceOrder>, order: Order, limit: u8) -> Result<
         }
     };
 
-    if event_heap.len() > event_heap_size_before {
-        position.penalty_heap_count += 1;
-    }
-
     token_transfer(
         deposit_amount,
         &ctx.accounts.token_program,

diff --git a/programs/openbook-v2/src/instructions/place_take_order.rs b/programs/openbook-v2/src/instructions/place_take_order.rs
@@ -33,7 +33,6 @@ pub fn place_take_order<'info>(
     };
 
     let mut event_heap = ctx.accounts.event_heap.load_mut()?;
-    let event_heap_size_before = event_heap.len();
 
     let now_ts: u64 = clock.unix_timestamp.try_into().unwrap();
 
@@ -89,15 +88,6 @@ pub fn place_take_order<'info>(
 
     drop(market);
 
-    if event_heap.len() > event_heap_size_before {
-        system_program_transfer(
-            PENALTY_EVENT_HEAP,
-            &ctx.accounts.system_program,
-            &ctx.accounts.penalty_payer,
-            &ctx.accounts.market,
-        )?;
-    }
-
     let (user_deposit_acc, user_withdraw_acc, market_deposit_acc, market_withdraw_acc) = match side
     {
         Side::Bid => (