skip builder fee accrual on full escrow account, dont throw

Author: wphan

programs/drift/src/controller/orders.rs

@@ -2308,7 +2308,7 @@ pub fn fulfill_perp_order_with_amm(
         filler_reward,
         referee_discount,
         referrer_reward,
-        fee_to_market_for_lp,
+        fee_to_market_for_lp: _fee_to_market_for_lp,
         maker_rebate,
         builder_fee: builder_fee_option,
     } = fees::calculate_fee_for_fulfillment_with_amm(

programs/drift/src/instructions/keeper.rs

@@ -865,7 +865,7 @@ pub fn place_signed_msg_taker_order<'c: 'info, 'info>(
                 .iter()
                 .position(|order| order.is_available())
                 .ok_or(ErrorCode::MaxNumberOfOrders)?;
-            escrow.add_order(RevenueShareOrder::new(
+            match escrow.add_order(RevenueShareOrder::new(
                 verified_message_and_signature.builder_idx.unwrap(),
                 taker.sub_account_id,
                 new_order_id,
@@ -874,8 +874,13 @@ pub fn place_signed_msg_taker_order<'c: 'info, 'info>(
                 market_index,
                 RevenueShareOrderBitFlag::Open as u8,
                 new_order_index as u8,
-            ))?;
-            escrow.find_order_mut(taker.sub_account_id, new_order_id)
+            )) {
+                Ok(order_idx) => escrow.get_order_mut(order_idx).ok(),
+                Err(_) => {
+                    msg!("Failed to add stop loss order, escrow is full");
+                    None
+                }
+            }
         } else {
             None
         };
@@ -925,7 +930,7 @@ pub fn place_signed_msg_taker_order<'c: 'info, 'info>(
                 .iter()
                 .position(|order| order.is_available())
                 .ok_or(ErrorCode::MaxNumberOfOrders)?;
-            escrow.add_order(RevenueShareOrder::new(
+            match escrow.add_order(RevenueShareOrder::new(
                 verified_message_and_signature.builder_idx.unwrap(),
                 taker.sub_account_id,
                 new_order_id,
@@ -934,8 +939,13 @@ pub fn place_signed_msg_taker_order<'c: 'info, 'info>(
                 market_index,
                 RevenueShareOrderBitFlag::Open as u8,
                 new_order_index as u8,
-            ))?;
-            escrow.find_order_mut(taker.sub_account_id, new_order_id)
+            )) {
+                Ok(order_idx) => escrow.get_order_mut(order_idx).ok(),
+                Err(_) => {
+                    msg!("Failed to add take profit order, escrow is full");
+                    None
+                }
+            }
         } else {
             None
         };
@@ -968,7 +978,7 @@ pub fn place_signed_msg_taker_order<'c: 'info, 'info>(
             .iter()
             .position(|order| order.is_available())
             .ok_or(ErrorCode::MaxNumberOfOrders)?;
-        escrow.add_order(RevenueShareOrder::new(
+        match escrow.add_order(RevenueShareOrder::new(
             verified_message_and_signature.builder_idx.unwrap(),
             taker.sub_account_id,
             new_order_id,
@@ -977,8 +987,13 @@ pub fn place_signed_msg_taker_order<'c: 'info, 'info>(
             market_index,
             RevenueShareOrderBitFlag::Open as u8,
             new_order_index as u8,
-        ))?;
-        escrow.find_order_mut(taker.sub_account_id, new_order_id)
+        )) {
+            Ok(order_idx) => escrow.get_order_mut(order_idx).ok(),
+            Err(_) => {
+                msg!("Failed to add order, escrow is full");
+                None
+            }
+        }
     } else {
         None
     };

programs/drift/src/state/revenue_share.rs

@@ -480,36 +480,6 @@ impl<'a> RevenueShareEscrowZeroCopyMut<'a> {
         Err(ErrorCode::RevenueShareEscrowOrdersAccountFull.into())
     }
 
-    pub fn find_order_mut(
-        &mut self,
-        sub_account_id: u16,
-        order_id: u32,
-    ) -> Option<&mut RevenueShareOrder> {
-        for i in 0..self.orders_len() {
-            if let Ok(existing_order) = self.get_order(i) {
-                if existing_order.order_id == order_id
-                    && existing_order.sub_account_id == sub_account_id
-                {
-                    return self.get_order_mut(i).ok();
-                }
-            }
-        }
-        None
-    }
-
-    pub fn find_order(&mut self, sub_account_id: u16, order_id: u32) -> Option<&RevenueShareOrder> {
-        for i in 0..self.orders_len() {
-            if let Ok(existing_order) = self.get_order(i) {
-                if existing_order.order_id == order_id
-                    && existing_order.sub_account_id == sub_account_id
-                {
-                    return self.get_order(i).ok();
-                }
-            }
-        }
-        None
-    }
-
     /// Marks any [`RevenueShareOrder`]s as Complete if there is no longer a corresponding
     /// open order in the user's account. This is used to lazily reconcile state when
     /// in place_order and settle_pnl instead of requiring explicit updates on cancels.