all tests pass

Author: Bengt Lofgren

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

@@ -227,7 +227,8 @@ pub fn prepare_order_response_cctp_shim(
     let finalized_vaa_message = data.finalized_vaa_message;
     // Load accounts
     let fast_market_order_zero_copy =
-        FastMarketOrderState::try_deserialize(&mut &fast_market_order.data.borrow()[..])?;
+        FastMarketOrderState::try_deserialize(&mut &fast_market_order.data.borrow()[..])
+            .map(Box::new)?;
     // 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
@@ -240,7 +241,7 @@ pub fn prepare_order_response_cctp_shim(
         let finalised_vaa_emitter_address = fast_market_order_zero_copy.vaa_emitter_address;
         let finalised_vaa_nonce = fast_market_order_zero_copy.vaa_nonce;
         let finalised_vaa_consistency_level = fast_market_order_zero_copy.vaa_consistency_level;
-        &finalized_vaa_message.digest(
+        finalized_vaa_message.digest(
             finalised_vaa_sequence,
             finalised_vaa_timestamp,
             finalised_vaa_emitter_chain,
@@ -277,7 +278,6 @@ pub fn prepare_order_response_cctp_shim(
     let slow_order_response = liquidity_layer_message
         .slow_order_response()
         .ok_or_else(|| MatchingEngineError::InvalidDepositPayloadId)?;
-
     let prepared_order_response_seeds = [
         PreparedOrderResponse::SEED_PREFIX,
         &fast_market_order_digest,
@@ -385,7 +385,7 @@ pub fn prepare_order_response_cctp_shim(
             &wormhole_svm_shim::verify_vaa::VerifyVaaShimInstruction::<false>::VERIFY_HASH_SELECTOR,
         );
         data.push(guardian_set_bump);
-        data.extend_from_slice(finalized_vaa_message_digest);
+        data.extend_from_slice(&finalized_vaa_message_digest);
         data
     };
 

solana/programs/matching-engine/tests/initialize_integration_tests.rs

@@ -6,6 +6,8 @@ use matching_engine::{CCTP_MINT_RECIPIENT, ID as PROGRAM_ID};
 use shimless::execute_order::execute_order_shimless_test;
 use solana_program_test::tokio;
 use solana_sdk::pubkey::Pubkey;
+use testing_engine::config::CreateCctpRouterEndpointsInstructionConfig;
+use utils::constants;
 mod shimful;
 mod shimless;
 mod testing_engine;
@@ -22,7 +24,7 @@ use shimful::shims::{
 use shimful::shims_execute_order::execute_order_fallback_test;
 use shimless::initialize::{initialize_program, AuctionParametersConfig};
 use shimless::make_offer::{improve_offer, place_initial_offer_shimless};
-use solana_sdk::transaction::VersionedTransaction;
+use solana_sdk::transaction::{TransactionError, VersionedTransaction};
 use utils::auction::AuctionAccounts;
 use utils::router::{add_local_router_endpoint_ix, create_all_router_endpoints_test};
 use utils::setup::{setup_environment, ShimMode, TestingContext, TransferDirection};
@@ -41,13 +43,13 @@ pub async fn test_initialize_program() {
 
     let initialize_config = InitializeInstructionConfig::default();
 
-    let testing_engine = TestingEngine::new(
-        testing_context,
-        vec![InstructionTrigger::InitializeProgram(initialize_config)],
-    )
-    .await;
+    let testing_engine = TestingEngine::new(testing_context).await;
 
-    testing_engine.execute().await;
+    testing_engine
+        .execute(vec![InstructionTrigger::InitializeProgram(
+            initialize_config,
+        )])
+        .await;
 }
 
 /// Test that a CCTP token router endpoint is created for the arbitrum and ethereum chains
@@ -62,16 +64,13 @@ pub async fn test_cctp_token_router_endpoint_creation() {
 
     let initialize_config = InitializeInstructionConfig::default();
 
-    let testing_engine = TestingEngine::new(
-        testing_context,
-        vec![
-            InstructionTrigger::InitializeProgram(initialize_config),
-            InstructionTrigger::CreateCctpRouterEndpoints,
-        ],
-    )
-    .await;
+    let testing_engine = TestingEngine::new(testing_context).await;
 
-    testing_engine.execute().await;
+    testing_engine
+        .execute(vec![InstructionTrigger::InitializeProgram(
+            initialize_config,
+        )])
+        .await;
 }
 
 #[tokio::test]
@@ -112,19 +111,19 @@ pub async fn test_setup_vaas() {
 
     testing_context.verify_vaas().await;
 
-    let testing_engine = TestingEngine::new(
-        testing_context,
-        vec![
+    let testing_engine = TestingEngine::new(testing_context).await;
+    testing_engine
+        .execute(vec![
             InstructionTrigger::InitializeProgram(InitializeInstructionConfig::default()),
-            InstructionTrigger::CreateCctpRouterEndpoints,
+            InstructionTrigger::CreateCctpRouterEndpoints(
+                CreateCctpRouterEndpointsInstructionConfig::default(),
+            ),
             InstructionTrigger::PlaceInitialOfferShimless(
                 PlaceInitialOfferInstructionConfig::default(),
             ),
             InstructionTrigger::ImproveOfferShimless(ImproveOfferInstructionConfig::default()),
-        ],
-    )
-    .await;
-    testing_engine.execute().await;
+        ])
+        .await;
 }
 
 #[tokio::test]
@@ -380,7 +379,7 @@ pub async fn test_place_initial_offer_fallback() {
         None,
     )
     .await;
-    let _initial_offer_fixture = place_initial_offer_fallback_test(
+    let initial_offer_fixture = place_initial_offer_fallback_test(
         &mut testing_context,
         &auction_accounts,
         true, // Expected to pass
@@ -390,13 +389,17 @@ pub async fn test_place_initial_offer_fallback() {
 
     // Attempt to improve the offer using the non-fallback method with another solver making the improved offer
     println!("Improving offer");
+    let auction_state = initial_offer_fixture
+        .expect("Failed to get initial offer fixture")
+        .auction_state;
     let second_solver = testing_context.testing_actors.solvers[1].clone();
     improve_offer(
         &mut testing_context,
         PROGRAM_ID,
         second_solver,
         auction_config_address,
         500_000,
+        &auction_state,
         None,
     )
     .await;
@@ -440,14 +443,19 @@ pub async fn test_place_initial_offer_shim_blocks_non_shim() {
     // Now test without the fallback program
     let mut auction_accounts = initial_offer_fallback_fixture.auction_accounts;
     auction_accounts.fast_vaa = Some(first_test_ft.get_vaa_pubkey());
+
+    let offer_price = 1__000_000;
+    let transaction_error = TransactionError::AccountInUse;
     place_initial_offer_shimless(
         &mut testing_context,
         &auction_accounts,
-        first_test_ft,
+        &first_test_ft,
+        offer_price,
         PROGRAM_ID,
         Some(&ExpectedError {
             instruction_index: 0,
-            error: MatchingEngineError::AccountAlreadyInitialized,
+            error_code: 0, // This is the error code for account in use
+            error_string: transaction_error.to_string(),
         }), // Expected to fail
     )
     .await;
@@ -480,10 +488,12 @@ pub async fn test_place_initial_offer_non_shim_blocks_shim() {
     )
     .await;
     // Place initial offer using the shimless instruction
+    let offer_price = 1__000_000;
     place_initial_offer_shimless(
         &mut testing_context,
         &auction_accounts,
-        first_test_ft,
+        &first_test_ft,
+        offer_price,
         PROGRAM_ID,
         None, // Expected to pass
     )
@@ -585,17 +595,23 @@ pub async fn test_execute_order_shimless() {
         Some(first_test_fast_transfer_pubkey),
     )
     .await;
-    place_initial_offer_shimless(
+    let offer_price = 1__000_000;
+    let auction_state = place_initial_offer_shimless(
         &mut testing_context,
         &auction_accounts,
-        first_test_fast_transfer,
+        &first_test_fast_transfer,
+        offer_price,
         PROGRAM_ID,
         None, // Expected to pass
     )
     .await;
-
-    let execute_order_fixture =
-        execute_order_shimless_test(&mut testing_context, &auction_accounts, true).await;
+    let execute_order_fixture = execute_order_shimless_test(
+        &mut testing_context,
+        &auction_accounts,
+        &auction_state,
+        None,
+    )
+    .await;
     assert!(execute_order_fixture.is_some());
 }
 pub async fn test_execute_order_fallback_blocks_shimless() {
@@ -642,9 +658,19 @@ pub async fn test_execute_order_fallback_blocks_shimless() {
     )
     .await
     .expect("Failed to execute order");
-
-    let shimless_execute_order_fixture =
-        execute_order_shimless_test(&mut testing_context, &auction_accounts, false).await;
+    let auction_state = initial_offer_fallback_fixture.auction_state;
+    let expected_error = Some(ExpectedError {
+        instruction_index: 0,
+        error_code: MatchingEngineError::AccountAlreadyInitialized.into(),
+        error_string: MatchingEngineError::AccountAlreadyInitialized.to_string(),
+    });
+    let shimless_execute_order_fixture = execute_order_shimless_test(
+        &mut testing_context,
+        &auction_accounts,
+        &auction_state,
+        expected_error,
+    )
+    .await;
     assert!(shimless_execute_order_fixture.is_none());
 }
 
@@ -713,7 +739,6 @@ pub async fn test_prepare_order_shim_fallback() {
     )
     .await
     .expect("Failed to execute order");
-
     shimful::shims_prepare_order_response::prepare_order_response_test(
         &testing_context.test_context,
         &payer_signer,
@@ -769,11 +794,13 @@ pub async fn test_settle_auction_complete() {
     // Try making initial offer using the shim instruction
     let usdc_mint_address = testing_context.get_usdc_mint_address();
     let auction_config_address = initialize_fixture.get_auction_config_address();
+    let router_config = CreateCctpRouterEndpointsInstructionConfig::default();
     let router_endpoints = create_all_router_endpoints_test(
         &testing_context,
         testing_context.testing_actors.owner.pubkey(),
         initialize_fixture.get_custodian_address(),
         testing_context.testing_actors.owner.keypair(),
+        router_config.chains,
     )
     .await;
 
@@ -833,8 +860,8 @@ pub async fn test_settle_auction_complete() {
             &execute_order_fixture,
             &initial_offer_fixture,
             &initialize_fixture,
-            &router_endpoints.ethereum.endpoint_address,
-            &router_endpoints.arbitrum.endpoint_address,
+            &auction_accounts.to_router_endpoint,
+            &auction_accounts.from_router_endpoint,
             &usdc_mint_address,
             &CCTP_MINT_RECIPIENT,
             &initialize_fixture.get_custodian_address(),

solana/programs/matching-engine/tests/shimful/shims.rs

@@ -1,3 +1,5 @@
+use crate::utils::auction::AuctionState;
+
 use super::super::utils;
 use super::super::utils::setup::TestingContext;
 use super::super::utils::{constants::*, setup::Solver};
@@ -413,7 +415,7 @@ fn generate_expected_guardian_signatures_info(
 
 // TODO: Separate this into a different file
 pub struct PlaceInitialOfferShimFixture {
-    pub auction_state: Rc<RefCell<utils::auction::ActiveAuctionState>>,
+    pub auction_state: AuctionState,
     pub guardian_set_pubkey: Pubkey,
     pub guardian_signatures_pubkey: Pubkey,
     pub fast_market_order_address: Pubkey,
@@ -577,10 +579,9 @@ pub async fn place_initial_offer_fallback(
                 offer_price,
             },
         };
-        testing_context.testing_state.auction_state =
-            utils::auction::AuctionState::Active(new_active_auction_state.clone());
+        let new_auction_state = utils::auction::AuctionState::Active(new_active_auction_state);
         Some(PlaceInitialOfferShimFixture {
-            auction_state: Rc::new(RefCell::new(new_active_auction_state)),
+            auction_state: new_auction_state,
             guardian_set_pubkey,
             guardian_signatures_pubkey: guardian_signatures_pubkey.clone().to_owned(),
             fast_market_order_address: fast_market_order_account,
@@ -663,7 +664,7 @@ pub async fn close_fast_market_order_fallback(
 
 pub fn create_fast_market_order_state_from_vaa_data(
     vaa_data: &utils::vaa::PostedVaaData,
-    refund_recipient: Pubkey,
+    close_account_refund_recipient: Pubkey,
 ) -> (FastMarketOrderState, utils::vaa::PostedVaaData) {
     let vaa_data = utils::vaa::PostedVaaData {
         consistency_level: vaa_data.consistency_level,
@@ -711,7 +712,7 @@ pub fn create_fast_market_order_state_from_vaa_data(
         order.max_fee,
         order.init_auction_fee,
         redeemer_message_fixed_length,
-        refund_recipient.to_bytes(),
+        close_account_refund_recipient.to_bytes(),
         vaa_data.sequence,
         vaa_data.vaa_time,
         vaa_data.nonce,

solana/programs/matching-engine/tests/shimful/shims_execute_order.rs

@@ -61,11 +61,13 @@ impl ExecuteOrderFallbackAccounts {
             fast_market_order_address: place_initial_offer_fixture.fast_market_order_address,
             active_auction: place_initial_offer_fixture
                 .auction_state
-                .borrow()
+                .get_active_auction()
+                .unwrap()
                 .auction_address,
             active_auction_custody_token: place_initial_offer_fixture
                 .auction_state
-                .borrow()
+                .get_active_auction()
+                .unwrap()
                 .auction_custody_token_address,
             active_auction_config: auction_accounts.auction_config,
             active_auction_best_offer_token: auction_accounts.offer_token,

solana/programs/matching-engine/tests/shimful/shims_prepare_order_response.rs

@@ -307,8 +307,8 @@ pub async fn prepare_order_response_test(
     execute_order_fixture: &ExecuteOrderFallbackFixture,
     initial_offer_fixture: &PlaceInitialOfferShimFixture,
     initialize_fixture: &InitializeFixture,
-    eth_endpoint_address: &Pubkey,
-    arb_endpoint_address: &Pubkey,
+    to_endpoint_address: &Pubkey,
+    from_endpoint_address: &Pubkey,
     usdc_mint_address: &Pubkey,
     cctp_mint_recipient: &Pubkey,
     custodian_address: &Pubkey,
@@ -368,8 +368,8 @@ pub async fn prepare_order_response_test(
         &execute_order_fixture,
         &initial_offer_fixture,
         &initialize_fixture,
-        &eth_endpoint_address,
-        &arb_endpoint_address,
+        &from_endpoint_address,
+        &to_endpoint_address,
         &usdc_mint_address,
         &cctp_message_decoded,
         &guardian_set_pubkey,