close market refund recipient is pubkey instead of bytes

Author: Bengt Lofgren

solana/modules/matching-engine-testing/tests/shimful/fast_market_order_shim.rs

@@ -94,7 +94,7 @@ fn initialise_fast_market_order_fallback_instruction(
         &[
             FastMarketOrderState::SEED_PREFIX,
             &fast_market_order.digest(),
-            &fast_market_order.close_account_refund_recipient,
+            &fast_market_order.close_account_refund_recipient.as_ref(),
         ],
         program_id,
     )
@@ -217,7 +217,7 @@ pub fn create_fast_market_order_state_from_vaa_data(
         max_fee: order.max_fee,
         init_auction_fee: order.init_auction_fee,
         redeemer_message: redeemer_message_fixed_length,
-        close_account_refund_recipient: close_account_refund_recipient.to_bytes(),
+        close_account_refund_recipient,
         vaa_sequence: vaa_data.sequence,
         vaa_timestamp: vaa_data.vaa_time,
         vaa_nonce: vaa_data.nonce,

solana/modules/matching-engine-testing/tests/testing_engine/engine.rs

@@ -497,7 +497,7 @@ impl TestingEngine {
             &[
                 FastMarketOrder::SEED_PREFIX,
                 &fast_market_order.digest(),
-                &fast_market_order.close_account_refund_recipient,
+                &fast_market_order.close_account_refund_recipient.as_ref(),
             ],
             &self.testing_context.get_matching_engine_program_id(),
         );
@@ -521,10 +521,8 @@ impl TestingEngine {
                     fast_market_order_address: fast_market_order_account,
                     fast_market_order_bump,
                     fast_market_order,
-                    close_account_refund_recipient: Pubkey::try_from_slice(
-                        &fast_market_order.close_account_refund_recipient,
-                    )
-                    .unwrap(),
+                    close_account_refund_recipient: fast_market_order
+                        .close_account_refund_recipient,
                 },
                 guardian_set_state: GuardianSetState {
                     guardian_set_address: guardian_signature_info.guardian_set_pubkey,

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

@@ -63,25 +63,25 @@ pub fn close_fast_market_order(accounts: &[AccountInfo]) -> Result<()> {
     let fast_market_order_deserialized = FastMarketOrder::try_read(fast_market_order_data)?;
     // Check that the fast_market_order is owned by the close_account_refund_recipient
     if fast_market_order_deserialized.close_account_refund_recipient
-        != close_account_refund_recipient.key().as_ref()
+        != close_account_refund_recipient.key()
     {
         return Err(MatchingEngineError::MismatchingCloseAccountRefundRecipient.into()).map_err(
             |e: Error| {
                 e.with_pubkeys((
-                    Pubkey::from(fast_market_order_deserialized.close_account_refund_recipient),
+                    fast_market_order_deserialized.close_account_refund_recipient,
                     close_account_refund_recipient.key(),
                 ))
             },
         );
     }
 
     if fast_market_order_deserialized.close_account_refund_recipient
-        != close_account_refund_recipient.key().as_ref()
+        != close_account_refund_recipient.key()
     {
         return Err(MatchingEngineError::MismatchingCloseAccountRefundRecipient.into()).map_err(
             |e: Error| {
                 e.with_pubkeys((
-                    Pubkey::from(fast_market_order_deserialized.close_account_refund_recipient),
+                    fast_market_order_deserialized.close_account_refund_recipient,
                     close_account_refund_recipient.key(),
                 ))
             },

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

@@ -144,6 +144,7 @@ pub fn create_account_reliably(
 /// * `data_len` - The length of the data to be written to the token account.
 /// * `accounts` - The accounts to be used in the CPI.
 /// * `signer_seeds` - The signer seeds to be used in the CPI.
+//TODO: Fix clippy warning
 #[allow(clippy::too_many_arguments)]
 pub fn create_token_account_reliably(
     payer_pubkey: &Pubkey,

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

@@ -523,7 +523,7 @@ mod tests {
             max_fee: 0,
             init_auction_fee: 0,
             redeemer_message: [0_u8; 512],
-            close_account_refund_recipient: [0_u8; 32],
+            close_account_refund_recipient: Pubkey::default(),
             vaa_sequence: 0,
             vaa_timestamp: 0,
             vaa_nonce: 0,

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

@@ -31,7 +31,7 @@ pub struct FastMarketOrder {
     /// The redeemer message of the fast transfer
     pub redeemer_message: [u8; 512],
     /// The refund recipient for the creator of the fast market order account
-    pub close_account_refund_recipient: [u8; 32],
+    pub close_account_refund_recipient: Pubkey,
     /// The emitter address of the fast transfer
     pub vaa_emitter_address: [u8; 32],
     /// The sequence of the fast transfer vaa
@@ -60,7 +60,7 @@ pub struct FastMarketOrderParams {
     pub max_fee: u64,
     pub init_auction_fee: u64,
     pub redeemer_message: [u8; 512],
-    pub close_account_refund_recipient: [u8; 32],
+    pub close_account_refund_recipient: Pubkey,
     pub vaa_sequence: u64,
     pub vaa_timestamp: u32,
     pub vaa_nonce: u32,