PR comments, featureflag clean up

Author: wphan

programs/drift/src/controller/liquidation.rs

@@ -676,7 +676,7 @@ pub fn liquidate_perp(
         maker_existing_base_asset_amount: maker_existing_base_asset_amount,
         trigger_price: None,
         builder_idx: None,
-        builder_fee: 0,
+        builder_fee: None,
     };
     emit!(fill_record);
 

programs/drift/src/controller/orders.rs

@@ -448,7 +448,7 @@ pub fn place_perp_order(
         None,
         None,
         None,
-        0,
+        None,
     )?;
     emit_stack::<_, { OrderActionRecord::SIZE }>(order_action_record)?;
 
@@ -730,7 +730,7 @@ pub fn cancel_order(
             None,
             None,
             None,
-            0,
+            None,
         )?;
         emit_stack::<_, { OrderActionRecord::SIZE }>(order_action_record)?;
     }
@@ -2304,9 +2304,9 @@ 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: builder_fee_option,
     } = fees::calculate_fee_for_fulfillment_with_amm(
         user_stats,
         quote_asset_amount,
@@ -2323,6 +2323,8 @@ pub fn fulfill_perp_order_with_amm(
         builder_order_fee_bps,
     )?;
 
+    let builder_fee = builder_fee_option.unwrap_or(0);
+
     if let (Some(idx), Some(escrow)) = (builder_order_idx, rev_share_escrow.as_mut()) {
         let mut order = escrow.get_order_mut(idx)?;
         order.fees_accrued = order.fees_accrued.safe_add(builder_fee)?;
@@ -2365,7 +2367,7 @@ pub fn fulfill_perp_order_with_amm(
 
     let position_index = get_position_index(&user.perp_positions, market.market_index)?;
 
-    if user_fee != 0 {
+    if user_fee != 0 || builder_fee != 0 {
         controller::position::update_quote_asset_and_break_even_amount(
             &mut user.perp_positions[position_index],
             market,
@@ -2502,7 +2504,7 @@ pub fn fulfill_perp_order_with_amm(
         maker_existing_base_asset_amount,
         None,
         builder_idx,
-        builder_fee,
+        builder_fee_option,
     )?;
     emit_stack::<_, { OrderActionRecord::SIZE }>(order_action_record)?;
 
@@ -2804,7 +2806,7 @@ pub fn fulfill_perp_order_with_match(
         filler_reward,
         referrer_reward,
         referee_discount,
-        builder_fee,
+        builder_fee: builder_fee_option,
         ..
     } = fees::calculate_fee_for_fulfillment_with_match(
         taker_stats,
@@ -2821,6 +2823,7 @@ pub fn fulfill_perp_order_with_match(
         taker.is_high_leverage_mode(MarginRequirementType::Initial),
         builder_order_fee_bps,
     )?;
+    let builder_fee = builder_fee_option.unwrap_or(0);
 
     if let (Some(idx), Some(escrow)) = (builder_order_idx, builder_escrow.as_deref_mut()) {
         let mut order = escrow.get_order_mut(idx)?;
@@ -2983,7 +2986,7 @@ pub fn fulfill_perp_order_with_match(
         maker_existing_base_asset_amount,
         None,
         builder_idx,
-        builder_fee,
+        builder_fee_option,
     )?;
     emit_stack::<_, { OrderActionRecord::SIZE }>(order_action_record)?;
 
@@ -3221,7 +3224,7 @@ pub fn trigger_order(
         None,
         Some(trigger_price),
         None,
-        0,
+        None,
     )?;
     emit!(order_action_record);
 
@@ -3786,7 +3789,7 @@ pub fn place_spot_order(
         None,
         None,
         None,
-        0,
+        None,
     )?;
     emit_stack::<_, { OrderActionRecord::SIZE }>(order_action_record)?;
 
@@ -5031,7 +5034,7 @@ pub fn fulfill_spot_order_with_match(
         None,
         None,
         None,
-        0,
+        None,
     )?;
     emit_stack::<_, { OrderActionRecord::SIZE }>(order_action_record)?;
 
@@ -5307,7 +5310,7 @@ pub fn fulfill_spot_order_with_external_market(
         None,
         None,
         None,
-        0,
+        None,
     )?;
     emit_stack::<_, { OrderActionRecord::SIZE }>(order_action_record)?;
 
@@ -5513,7 +5516,7 @@ pub fn trigger_spot_order(
         None,
         Some(oracle_price.unsigned_abs()),
         None,
-        0,
+        None,
     )?;
 
     emit!(order_action_record);

programs/drift/src/controller/revenue_share.rs

@@ -58,7 +58,9 @@ pub fn sweep_completed_revenue_share_for_market<'a>(
         };
 
         if is_referral_order {
-            if fees_accrued == 0 {
+            if fees_accrued == 0
+                || !(order_market_type == MarketType::Perp && order_market_index == market_index)
+            {
                 continue;
             }
         } else if !(is_completed

programs/drift/src/error.rs

@@ -647,16 +647,12 @@ pub enum ErrorCode {
     InvalidBuilderFee,
     #[msg("RevenueShareEscrow has too many active orders")]
     RevenueShareEscrowOrdersAccountFull,
-    #[msg("RevenueShareEscrow missing")]
-    RevenueShareEscrowMissing,
     #[msg("Invalid RevenueShareAccount")]
     InvalidRevenueShareAccount,
     #[msg("Cannot revoke builder with open orders")]
     CannotRevokeBuilderWithOpenOrders,
     #[msg("Unable to load builder account")]
     UnableToLoadRevenueShareAccount,
-    #[msg("RevenueShare order not found")]
-    RevenueShareOrderNotFound,
 }
 
 #[macro_export]

programs/drift/src/instructions/keeper.rs

@@ -145,7 +145,9 @@ fn fill_order<'c: 'info, 'info>(
     let (makers_and_referrer, makers_and_referrer_stats) =
         load_user_maps(remaining_accounts_iter, true)?;
 
-    let mut escrow = if state.builder_codes_enabled() {
+    let builder_codes_enabled = state.builder_codes_enabled();
+    let builder_referral_enabled = state.builder_referral_enabled();
+    let mut escrow = if builder_codes_enabled || builder_referral_enabled {
         get_revenue_share_escrow_account(&mut remaining_accounts_iter)?
     } else {
         None
@@ -175,7 +177,7 @@ fn fill_order<'c: 'info, 'info>(
         clock,
         FillMode::Fill,
         &mut escrow.as_mut(),
-        state.builder_referral_enabled(),
+        builder_referral_enabled,
     )?;
 
     Ok(())

programs/drift/src/instructions/user.rs

@@ -2029,7 +2029,7 @@ pub fn handle_transfer_perp_position<'c: 'info, 'info>(
         maker_existing_base_asset_amount: from_existing_base_asset_amount,
         trigger_price: None,
         builder_idx: None,
-        builder_fee: 0,
+        builder_fee: None,
     };
 
     emit_stack::<_, { OrderActionRecord::SIZE }>(fill_record)?;
@@ -2594,7 +2594,13 @@ pub fn handle_place_and_make_perp_order<'c: 'info, 'info>(
     makers_and_referrer.insert(ctx.accounts.user.key(), ctx.accounts.user.clone())?;
     makers_and_referrer_stats.insert(authority, ctx.accounts.user_stats.clone())?;
 
-    let mut escrow = get_revenue_share_escrow_account(remaining_accounts_iter)?;
+    let builder_referral_enabled = state.builder_referral_enabled();
+    let builder_codes_enabled = state.builder_codes_enabled();
+    let mut escrow = if builder_codes_enabled || builder_referral_enabled {
+        get_revenue_share_escrow_account(remaining_accounts_iter)?
+    } else {
+        None
+    };
 
     controller::orders::fill_perp_order(
         taker_order_id,
@@ -2612,7 +2618,7 @@ pub fn handle_place_and_make_perp_order<'c: 'info, 'info>(
         clock,
         FillMode::PlaceAndMake,
         &mut escrow.as_mut(),
-        state.builder_referral_enabled(),
+        builder_referral_enabled,
     )?;
 
     let order_exists = load!(ctx.accounts.user)?
@@ -2700,7 +2706,13 @@ pub fn handle_place_and_make_signed_msg_perp_order<'c: 'info, 'info>(
     makers_and_referrer.insert(ctx.accounts.user.key(), ctx.accounts.user.clone())?;
     makers_and_referrer_stats.insert(authority, ctx.accounts.user_stats.clone())?;
 
-    let mut escrow = get_revenue_share_escrow_account(remaining_accounts_iter)?;
+    let builder_referral_enabled = state.builder_referral_enabled();
+    let builder_codes_enabled = state.builder_codes_enabled();
+    let mut escrow = if builder_codes_enabled || builder_referral_enabled {
+        get_revenue_share_escrow_account(remaining_accounts_iter)?
+    } else {
+        None
+    };
 
     let taker_signed_msg_account = ctx.accounts.taker_signed_msg_user_orders.load()?;
     let taker_order_id = taker_signed_msg_account
@@ -2725,7 +2737,7 @@ pub fn handle_place_and_make_signed_msg_perp_order<'c: 'info, 'info>(
         clock,
         FillMode::PlaceAndMake,
         &mut escrow.as_mut(),
-        state.builder_referral_enabled(),
+        builder_referral_enabled,
     )?;
 
     let order_exists = load!(ctx.accounts.user)?

programs/drift/src/math/fees.rs

@@ -31,7 +31,7 @@ pub struct FillFees {
     pub filler_reward: u64,
     pub referrer_reward: u64,
     pub referee_discount: u64,
-    pub builder_fee: u64,
+    pub builder_fee: Option<u64>,
 }
 
 pub fn calculate_fee_for_fulfillment_with_amm(
@@ -95,7 +95,7 @@ pub fn calculate_fee_for_fulfillment_with_amm(
             filler_reward,
             referrer_reward: 0,
             referee_discount: 0,
-            builder_fee: 0,
+            builder_fee: None,
         })
     } else {
         let mut fee = calculate_taker_fee(quote_asset_amount, &fee_tier, fee_adjustment)?;
@@ -136,11 +136,13 @@ pub fn calculate_fee_for_fulfillment_with_amm(
         let fee_to_market_for_lp = fee_to_market.safe_sub(quote_asset_amount_surplus)?;
 
         let builder_fee = if let Some(builder_fee_bps) = builder_fee_bps {
-            quote_asset_amount
-                .safe_mul(builder_fee_bps.cast()?)?
-                .safe_div(100_000)?
+            Some(
+                quote_asset_amount
+                    .safe_mul(builder_fee_bps.cast()?)?
+                    .safe_div(100_000)?,
+            )
         } else {
-            0
+            None
         };
 
         // must be non-negative
@@ -352,11 +354,13 @@ pub fn calculate_fee_for_fulfillment_with_match(
         .cast::<i64>()?;
 
     let builder_fee = if let Some(builder_fee_bps) = builder_fee_bps {
-        quote_asset_amount
-            .safe_mul(builder_fee_bps.cast()?)?
-            .safe_div(100_000)?
+        Some(
+            quote_asset_amount
+                .safe_mul(builder_fee_bps.cast()?)?
+                .safe_div(100_000)?,
+        )
     } else {
-        0
+        None
     };
 
     Ok(FillFees {

programs/drift/src/state/events.rs

@@ -260,11 +260,11 @@ pub struct OrderActionRecord {
     /// the idx of the builder in the taker's [`RevenueShareEscrow`] account
     pub builder_idx: Option<u8>,
     /// precision: QUOTE_PRECISION builder fee paid by the taker
-    pub builder_fee: u64,
+    pub builder_fee: Option<u64>,
 }
 
 impl Size for OrderActionRecord {
-    const SIZE: usize = 472;
+    const SIZE: usize = 480;
 }
 
 pub fn get_order_action_record(
@@ -294,7 +294,7 @@ pub fn get_order_action_record(
     maker_existing_base_asset_amount: Option<u64>,
     trigger_price: Option<u64>,
     builder_idx: Option<u8>,
-    builder_fee: u64,
+    builder_fee: Option<u64>,
 ) -> DriftResult<OrderActionRecord> {
     Ok(OrderActionRecord {
         ts,