place initial offer helper function with reuse

Author: Bengt Lofgren

solana/programs/matching-engine/src/fallback/processor/place_initial_offer.rs

@@ -6,6 +6,7 @@ use solana_program::{instruction::Instruction, program::invoke_signed_unchecked}
 
 use crate::{
     error::MatchingEngineError,
+    processor::calculate_security_deposit,
     state::{Auction, AuctionInfo, AuctionStatus, MessageProtocol},
     ID,
 };
@@ -261,11 +262,10 @@ pub(super) fn process(
 
     // The total amount being transferred to the auction's custody token account
     // is the order's amount and auction participant's security deposit.
-    let security_deposit = fast_market_order.max_fee.saturating_add(
-        crate::utils::auction::compute_notional_security_deposit(
-            &auction_config,
-            fast_market_order.amount_in,
-        ),
+    let security_deposit = calculate_security_deposit(
+        fast_market_order.max_fee,
+        fast_market_order.amount_in,
+        &auction_config,
     );
 
     let transfer_ix = spl_token::instruction::transfer(

solana/programs/matching-engine/src/processor/auction/execute_fast_order/mod.rs

@@ -105,12 +105,12 @@ pub struct ActiveAuctionAccountInfos<'ix> {
     pub auction_custodian: AccountInfo<'ix>,
 }
 
-pub fn get_user_amount_and_new_status_and_penalized<'ix>(
+pub fn get_user_amount_and_new_status_and_penalized(
     auction: &Auction,
     custody_token: &TokenAccount,
     auction_config: &AuctionConfig,
     init_auction_fee: u64,
-    active_auction_account_infos: ActiveAuctionAccountInfos<'ix>,
+    active_auction_account_infos: ActiveAuctionAccountInfos<'_>,
     accounts: &[AccountInfo],
 ) -> Result<(u64, AuctionStatus, bool)> {
     let auction_info = auction.info.as_ref().unwrap();
@@ -288,9 +288,9 @@ pub fn get_user_amount_and_new_status_and_penalized<'ix>(
     ))
 }
 
-pub fn get_order_executed_event<'ix>(
+pub fn get_order_executed_event(
     auction: &Auction,
-    fast_vaa: &AccountInfo<'ix>,
+    fast_vaa: &AccountInfo<'_>,
     auction_info: &AuctionInfo,
     penalized: bool,
 ) -> OrderExecuted {

solana/programs/matching-engine/src/processor/auction/offer/place_initial/cctp.rs

@@ -1,7 +1,9 @@
 use crate::{
     composite::*,
     error::MatchingEngineError,
-    state::{Auction, AuctionConfig, AuctionInfo, AuctionStatus, MessageProtocol},
+    state::{
+        Auction, AuctionConfig, AuctionInfo, AuctionParameters, AuctionStatus, MessageProtocol,
+    },
     utils,
 };
 use anchor_lang::prelude::*;
@@ -131,12 +133,7 @@ pub fn place_initial_offer_cctp(
     // Saturating to u64::MAX is safe here. If the amount really ends up being this large, the
     // checked addition below will catch it.
     let security_deposit =
-        order
-            .max_fee()
-            .saturating_add(utils::auction::compute_notional_security_deposit(
-                &ctx.accounts.auction_config,
-                amount_in,
-            ));
+        calculate_security_deposit(order.max_fee(), amount_in, &ctx.accounts.auction_config);
 
     // Set up the Auction account for this auction.
     let config = &ctx.accounts.auction_config;
@@ -206,3 +203,14 @@ pub fn place_initial_offer_cctp(
             .ok_or_else(|| MatchingEngineError::U64Overflow)?,
     )
 }
+
+pub fn calculate_security_deposit(
+    max_fee: u64,
+    amount_in: u64,
+    auction_parameters: &AuctionParameters,
+) -> u64 {
+    max_fee.saturating_add(utils::auction::compute_notional_security_deposit(
+        auction_parameters,
+        amount_in,
+    ))
+}