added error code, and some program checks

Author: Bengt Lofgren

solana/programs/matching-engine/src/error.rs

@@ -100,9 +100,15 @@ pub enum MatchingEngineError {
     TokenTransferFailed = 0x70c,
     InvalidMint = 0x70e,
 
+    // Place initial offer errors
     #[msg("From and to router endpoints are the same")]
     SameEndpoints = 0x800,
-    InvalidCctpMessage = 0x802,
+
+    // Close fast market order errors
+    MismatchingCloseAccountRefundRecipient = 0xa10,
+
+    // Execute order errors
+    InvalidCctpMessage = 0x902,
 }
 
 #[cfg(test)]

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

@@ -1,3 +1,4 @@
+use crate::error::MatchingEngineError;
 use crate::state::FastMarketOrder;
 use anchor_lang::prelude::*;
 use solana_program::instruction::Instruction;
@@ -63,12 +64,14 @@ pub fn close_fast_market_order(accounts: &[AccountInfo]) -> Result<()> {
     if fast_market_order_data.close_account_refund_recipient
         != close_account_refund_recipient.key().as_ref()
     {
-        return Err(ProgramError::InvalidAccountData.into()).map_err(|e: Error| {
-            e.with_pubkeys((
-                Pubkey::from(fast_market_order_data.close_account_refund_recipient),
-                close_account_refund_recipient.key(),
-            ))
-        });
+        return Err(MatchingEngineError::MismatchingCloseAccountRefundRecipient.into()).map_err(
+            |e: Error| {
+                e.with_pubkeys((
+                    Pubkey::from(fast_market_order_data.close_account_refund_recipient),
+                    close_account_refund_recipient.key(),
+                ))
+            },
+        );
     }
 
     // First, get the current lamports value

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

@@ -358,7 +358,6 @@ pub fn handle_execute_order_shim(accounts: &[AccountInfo]) -> Result<()> {
         });
     };
 
-    // TODO: Done with auction checks, now on to executor token checks
     if executor_token_account.key() != active_auction.info.as_ref().unwrap().best_offer_token {
         msg!("Executor token is not equal to best offer token");
         return Err(ErrorCode::ConstraintAddress.into()).map_err(|e: Error| {

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

@@ -122,7 +122,6 @@ pub fn initialise_fast_market_order(
         guardian_set_bump,
         _padding: _,
     } = *data;
-
     // Start of cpi call to verify the shim.
     // ------------------------------------------------------------------------------------------------
     let fast_market_order_digest = fast_market_order.digest();
@@ -191,7 +190,6 @@ pub fn initialise_fast_market_order(
         &program_id,
         fast_market_order_signer_seeds,
     )?;
-
     // Borrow the account data mutably
     let mut fast_market_order_account_data = fast_market_order_account.try_borrow_mut_data()?;
 
@@ -206,7 +204,6 @@ pub fn initialise_fast_market_order(
         msg!("Account data buffer too small");
         return Err(MatchingEngineError::AccountDataTooSmall.into());
     }
-
     // Write the fast_market_order struct to the account
     fast_market_order_account_data[8..8_usize.saturating_add(fast_market_order_bytes.len())]
         .copy_from_slice(fast_market_order_bytes);

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

@@ -182,7 +182,6 @@ pub fn place_initial_offer_cctp_shim(
     // Check all accounts are valid
     check_account_length(accounts, 11)?;
     // Extract data fields
-    // TODO: Remove sequence, vaa_time because they are in the fast market order state
     let PlaceInitialOfferCctpShimData { offer_price } = *data;
 
     let signer = &accounts[0];
@@ -198,6 +197,13 @@ pub fn place_initial_offer_cctp_shim(
     let auction_custody_token = &accounts[9];
     let usdc = &accounts[10];
 
+    // Check that the fast market order account is owned by the program
+    if fast_market_order_account.owner != program_id {
+        msg!("Fast market order account owner is invalid");
+        return Err(ErrorCode::ConstraintOwner.into())
+            .map_err(|e: Error| e.with_account_name("fast_market_order_account"));
+    }
+
     let fast_market_order_zero_copy =
         FastMarketOrderState::try_deserialize(&mut &fast_market_order_account.data.borrow()[..])?;
 

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

@@ -172,7 +172,6 @@ impl<'ix> PrepareOrderResponseCctpShimAccounts<'ix> {
     }
 }
 
-// TODO: Also close the fast market order account since it is no longer needed
 pub struct PrepareOrderResponseCctpShim<'ix> {
     pub program_id: &'ix Pubkey,
     pub accounts: PrepareOrderResponseCctpShimAccounts<'ix>,
@@ -256,7 +255,6 @@ pub fn prepare_order_response_cctp_shim(
         FastMarketOrderState::try_read(&fast_market_order_account_data[..])?;
     // Create pdas for addresses that need to be created
     // Check the prepared order response account is valid
-    // TODO: Pass the digest so it isn't recomputed
     let fast_market_order_digest = fast_market_order_zero_copy.digest();
     // Construct the finalised vaa message digest data
     let finalized_vaa_message_digest = {
@@ -286,7 +284,6 @@ pub fn prepare_order_response_cctp_shim(
         Custodian::try_deserialize(&mut &custodian.data.borrow()[..]).map(Box::new)?;
     // Deserialise the to_endpoint account
 
-    // TODO:  Scope this to do checks and deallocate stack
     let to_endpoint_account =
         RouterEndpoint::try_deserialize(&mut &to_endpoint.data.borrow()[..]).map(Box::new)?;
     // Deserialise the from_endpoint account
@@ -296,7 +293,7 @@ pub fn prepare_order_response_cctp_shim(
     let guardian_set_bump = finalized_vaa_message.guardian_set_bump;
 
     // Check loaded vaa is deposit message
-    // TODO: Fix errors
+    // TODO: Fix errors to be more specific
     let liquidity_layer_message =
         LiquidityLayerDepositMessage::parse(&finalized_vaa_message.deposit_payload)
             .map_err(|_| MatchingEngineError::InvalidDepositPayloadId)?;