[broken] forcing payer_signer to be close_account_refund_recipient

Author: bengtlofgren

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

@@ -61,7 +61,7 @@ pub async fn initialize_fast_market_order_shimful(
     let payer_signer = config
         .payer_signer
         .clone()
-        .unwrap_or_else(|| testing_context.testing_actors.payer_signer.clone());
+        .unwrap_or_else(|| testing_context.testing_actors.solvers[0].keypair().clone());
     let guardian_signature_info = create_guardian_signatures(
         testing_context,
         test_context,
@@ -77,7 +77,7 @@ pub async fn initialize_fast_market_order_shimful(
         &[
             FastMarketOrderState::SEED_PREFIX,
             &fast_market_order.digest().as_ref(),
-            &fast_market_order.close_account_refund_recipient.as_ref(),
+            &payer_signer.pubkey().as_ref(),
         ],
         program_id,
     );
@@ -157,7 +157,7 @@ pub fn initialize_fast_market_order_shimful_instruction(
         &[
             FastMarketOrderState::SEED_PREFIX,
             &fast_market_order.digest().as_ref(),
-            &fast_market_order.close_account_refund_recipient.as_ref(),
+            &payer_signer.pubkey().as_ref(),
         ],
         program_id,
     )

solana/modules/matching-engine-testing/tests/test_scenarios/create_and_close_fast_market_order.rs

@@ -114,47 +114,6 @@ pub async fn test_close_fast_market_order_fallback() {
         .await;
 }
 
-/// Test that the close fast market order account works correctly for the fallback instruction
-#[tokio::test]
-pub async fn test_close_fast_market_order_fallback_with_custom_refund_recipient() {
-    let vaa_args = vec![VaaArgs {
-        post_vaa: false,
-        ..VaaArgs::default()
-    }];
-    let (testing_context, mut test_context) = setup_environment(
-        ShimMode::VerifyAndPostSignature,
-        TransferDirection::FromArbitrumToEthereum,
-        Some(vaa_args),
-    )
-    .await;
-    let solver_1 = &testing_context.testing_actors.solvers[1].clone();
-    let solver_1_balance_before = solver_1.get_lamport_balance(&mut test_context).await;
-    let testing_engine = TestingEngine::new(testing_context).await;
-    let instruction_triggers = vec![
-        InstructionTrigger::InitializeProgram(InitializeInstructionConfig::default()),
-        InstructionTrigger::CreateCctpRouterEndpoints(
-            CreateCctpRouterEndpointsInstructionConfig::default(),
-        ),
-        InstructionTrigger::InitializeFastMarketOrderShim(
-            InitializeFastMarketOrderShimInstructionConfig {
-                close_account_refund_recipient: Some(solver_1.pubkey()),
-                ..InitializeFastMarketOrderShimInstructionConfig::default()
-            },
-        ),
-        InstructionTrigger::CloseFastMarketOrderShim(CloseFastMarketOrderShimInstructionConfig {
-            close_account_refund_recipient_keypair: Some(solver_1.keypair()),
-            ..CloseFastMarketOrderShimInstructionConfig::default()
-        }),
-    ];
-    testing_engine
-        .execute(&mut test_context, instruction_triggers, None)
-        .await;
-    let solver_1_balance_after = solver_1.get_lamport_balance(&mut test_context).await;
-    assert!(
-        solver_1_balance_after > solver_1_balance_before,
-        "Solver 1 balance after is not greater than balance before"
-    );
-}
 
 /*
                     Sad path tests Section
@@ -332,7 +291,6 @@ pub async fn test_multiple_fast_market_orders_can_be_opened_and_closed_by_differ
     )
     .await;
     let solver_1 = testing_context.testing_actors.solvers[1].clone();
-    let solver_2 = testing_context.testing_actors.solvers[2].clone();
     let testing_engine = TestingEngine::new(testing_context).await;
     let instruction_triggers = vec![
         InstructionTrigger::InitializeProgram(InitializeInstructionConfig::default()),
@@ -357,6 +315,7 @@ pub async fn test_multiple_fast_market_orders_can_be_opened_and_closed_by_differ
     let instruction_triggers_1 = vec![InstructionTrigger::InitializeFastMarketOrderShim(
         InitializeFastMarketOrderShimInstructionConfig {
             fast_market_order_id: 1,
+            payer_signer: Some(solver_1.keypair()),
             close_account_refund_recipient: Some(solver_1.pubkey()),
             ..InitializeFastMarketOrderShimInstructionConfig::default()
         },
@@ -377,13 +336,6 @@ pub async fn test_multiple_fast_market_orders_can_be_opened_and_closed_by_differ
             fast_market_order_address: Some(fast_market_order_0_pubkey),
             ..CloseFastMarketOrderShimInstructionConfig::default()
         }),
-        InstructionTrigger::InitializeFastMarketOrderShim(
-            InitializeFastMarketOrderShimInstructionConfig {
-                fast_market_order_id: 2,
-                close_account_refund_recipient: Some(solver_2.pubkey()),
-                ..InitializeFastMarketOrderShimInstructionConfig::default()
-            },
-        ),
     ];
     let current_state = testing_engine
         .execute(
@@ -398,12 +350,6 @@ pub async fn test_multiple_fast_market_orders_can_be_opened_and_closed_by_differ
         .fast_market_order_address;
     let instruction_triggers_3 = vec![
         InstructionTrigger::CloseFastMarketOrderShim(CloseFastMarketOrderShimInstructionConfig {
-            close_account_refund_recipient_keypair: Some(solver_2.keypair()),
-            fast_market_order_address: Some(fast_market_order_2_pubkey),
-            ..CloseFastMarketOrderShimInstructionConfig::default()
-        }),
-        InstructionTrigger::CloseFastMarketOrderShim(CloseFastMarketOrderShimInstructionConfig {
-            close_account_refund_recipient_keypair: Some(solver_1.keypair()),
             fast_market_order_address: Some(fast_market_order_1_pubkey),
             ..CloseFastMarketOrderShimInstructionConfig::default()
         }),

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

@@ -92,7 +92,7 @@ pub enum MatchingEngineError {
 
     InvalidVerifyVaaShimProgram = 0x600,
 
-    // Fallback matching engine errors
+    // V2 matching engine errors
     AccountAlreadyInitialized = 0x700,
     AccountNotWritable = 0x702,
     BorshDeserializationError = 0x704,

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

@@ -115,6 +115,12 @@ pub(super) fn process(
     // fast market order account.
     let payer_info = &accounts[0];
 
+    require_keys_eq!(
+        *payer_info.key,
+        fast_market_order.close_account_refund_recipient,
+        MatchingEngineError::MismatchingCloseAccountRefundRecipient
+    );
+
     // These accounts will be used by the Verify VAA shim program.
     let from_endpoint = super::helpers::try_live_endpoint_account(&accounts[1], "from_endpoint")
         .map_err(|e: Error| e.with_account_name("from_endpoint"))?;
@@ -143,7 +149,7 @@ pub(super) fn process(
         &[
             FastMarketOrder::SEED_PREFIX,
             &fast_market_order_vaa_digest.as_ref(),
-            fast_market_order.close_account_refund_recipient.as_ref(),
+            payer_info.key.as_ref(),
         ],
         &ID,
     );
@@ -162,8 +168,7 @@ pub(super) fn process(
         &[&[
             FastMarketOrder::SEED_PREFIX,
             &fast_market_order_vaa_digest.as_ref(),
-            // TODO: Replace with payer_info.key.
-            fast_market_order.close_account_refund_recipient.as_ref(),
+            payer_info.key.as_ref(),
             &[fast_market_order_bump],
         ]],
     )?;

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

@@ -64,7 +64,7 @@ pub struct FastMarketOrderParams {
     pub max_fee: u64,
     pub init_auction_fee: u64,
     pub redeemer_message: [u8; 512],
-    pub close_account_refund_recipient: Pubkey,
+    pub close_account_refund_recipient: Pubkey, // Same as the payer
     pub vaa_sequence: u64,
     pub vaa_timestamp: u32,
     pub vaa_emitter_chain: u16,