improvements from the call

Author: Bengt Lofgren

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

@@ -75,19 +75,6 @@ pub fn close_fast_market_order(accounts: &[AccountInfo]) -> Result<()> {
         );
     }
 
-    if fast_market_order_deserialized.close_account_refund_recipient
-        != close_account_refund_recipient.key()
-    {
-        return Err(MatchingEngineError::MismatchingCloseAccountRefundRecipient.into()).map_err(
-            |e: Error| {
-                e.with_pubkeys((
-                    fast_market_order_deserialized.close_account_refund_recipient,
-                    close_account_refund_recipient.key(),
-                ))
-            },
-        );
-    }
-
     // First, get the current lamports value
     let current_recipient_lamports = **close_account_refund_recipient.lamports.borrow();
 

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

@@ -471,7 +471,6 @@ pub fn handle_execute_order_shim(accounts: &[AccountInfo]) -> Result<()> {
         .saturating_add(active_auction_info.security_deposit)
         .saturating_sub(user_reward);
 
-    msg!("Security deposit: {}", active_auction_info.security_deposit);
 
     let penalized = penalty > 0;
 
@@ -493,7 +492,6 @@ pub fn handle_execute_order_shim(accounts: &[AccountInfo]) -> Result<()> {
     if utils::checked_deserialize_token_account(initial_offer_token_account, &common::USDC_MINT)
         .is_some()
     {
-        msg!("Initial offer token account exists");
         if active_auction_best_offer_token_account.key() != initial_offer_token_account.key() {
             // Pay the auction initiator their fee.
             let transfer_ix = spl_token::instruction::transfer(
@@ -505,10 +503,7 @@ pub fn handle_execute_order_shim(accounts: &[AccountInfo]) -> Result<()> {
                 init_auction_fee,
             )
             .unwrap();
-            msg!(
-                "Sending init auction fee {} to initial offer token account",
-                init_auction_fee
-            );
+     
             invoke_signed_unchecked(&transfer_ix, accounts, &[auction_signer_seeds])?;
             // Because the initial offer token was paid this fee, we account for it here.
             remaining_custodied_amount =
@@ -518,7 +513,6 @@ pub fn handle_execute_order_shim(accounts: &[AccountInfo]) -> Result<()> {
             deposit_and_fee = deposit_and_fee
                 .checked_add(init_auction_fee)
                 .ok_or_else(|| MatchingEngineError::U64Overflow)?;
-            msg!("New deposit and fee: {}", deposit_and_fee);
         }
     }
 

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

@@ -318,6 +318,12 @@ pub fn place_initial_offer_cctp_shim(
         return Err(MatchingEngineError::InvalidSourceRouter.into());
     }
 
+    // Check that the vaa emitter chain is equal to the from_endpoints chain
+    if from_endpoint_account.chain != fast_market_order_zero_copy.vaa_emitter_chain {
+        msg!("Vaa emitter chain is not equal to the from_endpoints chain");
+        return Err(MatchingEngineError::InvalidSourceRouter.into());
+    }
+
     // Check that to endpoint chain is equal to the fast_market_order target_chain
     if to_endpoint_account.chain != fast_market_order_zero_copy.target_chain {
         msg!("To endpoint chain is not equal to the fast_market_order target_chain");

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

@@ -295,12 +295,14 @@ pub fn prepare_order_response_cctp_shim(
         MatchingEngineError::InvalidTargetRouter
     );
 
+    // Check that the prepared order response pda is equal to the prepared order response account key
     require_eq!(
         prepared_order_response_pda,
         prepared_order_response.key(),
         MatchingEngineError::InvalidPda
     );
 
+    // Check that the prepared custody token pda is equal to the prepared custody token account key
     require_eq!(
         prepared_custody_token_pda,
         prepared_custody_token.key(),

solana/programs/matching-engine/src/state/fast_market_order.rs

@@ -29,6 +29,7 @@ pub struct FastMarketOrder {
     /// The initial auction fee of the fast transfer
     pub init_auction_fee: u64,
     /// The redeemer message of the fast transfer
+    /// NOTE: This value is based on the max redeemer length of 500 bytes that is specified in the token router program. If this changes in the future, this value must be updated.
     pub redeemer_message: [u8; 512],
     /// The refund recipient for the creator of the fast market order account
     pub close_account_refund_recipient: Pubkey,
@@ -38,7 +39,8 @@ pub struct FastMarketOrder {
     pub vaa_sequence: u64,
     /// The timestamp of the fast transfer vaa
     pub vaa_timestamp: u32,
-    /// The vaa nonce, which is not used and can be set to 0
+    /// The vaa nonce, which is not used and can be set to 0. 
+    // TODO: Can be taken out.
     pub vaa_nonce: u32,
     /// The source chain of the fast transfer vaa (represented as a wormhole chain id)
     pub vaa_emitter_chain: u16,