move authority check into get_revenue_share_escrow_account

Author: wphan

programs/drift/src/error.rs

@@ -645,6 +645,8 @@ pub enum ErrorCode {
     BuilderRevoked,
     #[msg("Builder fee is greater than max fee bps")]
     InvalidBuilderFee,
+    #[msg("RevenueShareEscrow authority mismatch")]
+    RevenueShareEscrowAuthorityMismatch,
     #[msg("RevenueShareEscrow has too many active orders")]
     RevenueShareEscrowOrdersAccountFull,
     #[msg("Invalid RevenueShareAccount")]

programs/drift/src/instructions/keeper.rs

@@ -148,7 +148,7 @@ fn fill_order<'c: 'info, 'info>(
     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)?
+        get_revenue_share_escrow_account(&mut remaining_accounts_iter, &load!(ctx.accounts.user)?.authority)?
     } else {
         None
     };
@@ -643,16 +643,16 @@ pub fn handle_place_signed_msg_taker_order<'c: 'info, 'info>(
 
     let high_leverage_mode_config = get_high_leverage_mode_config(&mut remaining_accounts)?;
 
+    let taker_key = ctx.accounts.user.key();
+    let mut taker = load_mut!(ctx.accounts.user)?;
+    let mut signed_msg_taker = ctx.accounts.signed_msg_user_orders.load_mut()?;
+
     let escrow = if state.builder_codes_enabled() {
-        get_revenue_share_escrow_account(&mut remaining_accounts)?
+        get_revenue_share_escrow_account(&mut remaining_accounts, &taker.authority)?
     } else {
         None
     };
 
-    let taker_key = ctx.accounts.user.key();
-    let mut taker = load_mut!(ctx.accounts.user)?;
-    let mut signed_msg_taker = ctx.accounts.signed_msg_user_orders.load_mut()?;
-
     place_signed_msg_taker_order(
         taker_key,
         &mut taker,
@@ -1054,7 +1054,7 @@ pub fn handle_settle_pnl<'c: 'info, 'info>(
     let (mut builder_escrow, maybe_rev_share_map) =
         if state.builder_codes_enabled() || state.builder_referral_enabled() {
             (
-                get_revenue_share_escrow_account(&mut remaining_accounts)?,
+                get_revenue_share_escrow_account(&mut remaining_accounts, &user.authority)?,
                 load_revenue_share_map(&mut remaining_accounts).ok(),
             )
         } else {
@@ -1162,7 +1162,7 @@ pub fn handle_settle_multiple_pnls<'c: 'info, 'info>(
     let (mut builder_escrow, maybe_rev_share_map) =
         if state.builder_codes_enabled() || state.builder_referral_enabled() {
             (
-                get_revenue_share_escrow_account(&mut remaining_accounts)?,
+                get_revenue_share_escrow_account(&mut remaining_accounts, &user.authority)?,
                 load_revenue_share_map(&mut remaining_accounts).ok(),
             )
         } else {

programs/drift/src/instructions/optional_accounts.rs

@@ -20,7 +20,7 @@ use crate::state::traits::Size;
 use crate::state::user::{User, UserStats};
 use crate::{validate, OracleSource};
 use anchor_lang::accounts::account::Account;
-use anchor_lang::prelude::{AccountInfo, Interface};
+use anchor_lang::prelude::{AccountInfo, Interface, Pubkey};
 use anchor_lang::prelude::{AccountLoader, InterfaceAccount};
 use anchor_lang::Discriminator;
 use anchor_spl::token::TokenAccount;
@@ -279,6 +279,7 @@ pub fn get_high_leverage_mode_config<'a>(
 
 pub fn get_revenue_share_escrow_account<'a>(
     account_info_iter: &mut Peekable<Iter<'a, AccountInfo<'a>>>,
+    expected_authority: &Pubkey,
 ) -> DriftResult<Option<RevenueShareEscrowZeroCopyMut<'a>>> {
     let account_info = account_info_iter.peek();
     if account_info.is_none() {
@@ -304,5 +305,11 @@ pub fn get_revenue_share_escrow_account<'a>(
     drop(borrowed_data);
     let escrow: RevenueShareEscrowZeroCopyMut<'a> = account_info.load_zc_mut()?;
 
+    validate!(
+        escrow.fixed.authority == *expected_authority,
+        ErrorCode::RevenueShareEscrowAuthorityMismatch,
+        "invalid RevenueShareEscrow authority"
+    )?;
+
     Ok(Some(escrow))
 }

programs/drift/src/instructions/user.rs

@@ -2597,7 +2597,7 @@ pub fn handle_place_and_make_perp_order<'c: 'info, 'info>(
     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)?
+        get_revenue_share_escrow_account(remaining_accounts_iter, &load!(ctx.accounts.taker)?.authority)?
     } else {
         None
     };
@@ -2709,7 +2709,7 @@ pub fn handle_place_and_make_signed_msg_perp_order<'c: 'info, 'info>(
     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)?
+        get_revenue_share_escrow_account(remaining_accounts_iter, &load!(ctx.accounts.taker)?.authority)?
     } else {
         None
     };

programs/drift/src/state/revenue_share_map.rs

@@ -10,7 +10,7 @@ use anchor_lang::Discriminator;
 use arrayref::array_ref;
 use solana_program::account_info::AccountInfo;
 use solana_program::pubkey::Pubkey;
-use std::cell::{Ref, RefMut};
+use std::cell::RefMut;
 use std::collections::BTreeMap;
 use std::iter::Peekable;
 use std::panic::Location;

sdk/src/idl/drift.json

@@ -14041,7 +14041,9 @@
         },
         {
           "name": "builderFee",
-          "type": "u64",
+          "type": {
+            "option": "u64"
+          },
           "index": false
         }
       ]
@@ -16685,13 +16687,13 @@
     },
     {
       "code": 6320,
-      "name": "RevenueShareEscrowOrdersAccountFull",
-      "msg": "RevenueShareEscrow has too many active orders"
+      "name": "RevenueShareEscrowAuthorityMismatch",
+      "msg": "RevenueShareEscrow authority mismatch"
     },
     {
       "code": 6321,
-      "name": "RevenueShareEscrowMissing",
-      "msg": "RevenueShareEscrow missing"
+      "name": "RevenueShareEscrowOrdersAccountFull",
+      "msg": "RevenueShareEscrow has too many active orders"
     },
     {
       "code": 6322,
@@ -16707,11 +16709,6 @@
       "code": 6324,
       "name": "UnableToLoadRevenueShareAccount",
       "msg": "Unable to load builder account"
-    },
-    {
-      "code": 6325,
-      "name": "RevenueShareOrderNotFound",
-      "msg": "RevenueShare order not found"
     }
   ],
   "metadata": {

tests/builderCodes.ts

@@ -650,11 +650,11 @@ describe('builder codes', () => {
 		const events = parseLogs(builderClient.program, logs);
 		assert(events[0].name === 'OrderActionRecord');
 		const fillQuoteAssetAmount = events[0].data['quoteAssetAmountFilled'] as BN;
-		const builderFee = events[0].data['builderFee'] as BN;
+		const builderFee = events[0].data['builderFee'] as BN | null;
 		const takerFee = events[0].data['takerFee'] as BN;
 		const totalFeePaid = takerFee;
 		const referrerReward = new BN(events[0].data['referrerReward'] as number);
-		assert(builderFee.eq(ZERO));
+		assert(builderFee === null);
 		assert(referrerReward.gt(ZERO));
 
 		await user2Client.fetchAccounts();