execute order added as well

Author: Bengt Lofgren

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

@@ -1,8 +1,8 @@
 pub mod process_instruction;
 pub use process_instruction::*;
-// pub mod burn_and_post;
+pub mod burn_and_post;
 pub mod close_fast_market_order;
-// pub mod execute_order;
+pub mod execute_order;
 pub mod initialise_fast_market_order;
 pub mod place_initial_offer;
 // pub mod prepare_order_response;

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

@@ -1,5 +1,5 @@
 use super::close_fast_market_order::close_fast_market_order;
-// use super::execute_order::handle_execute_order_shim;
+use super::execute_order::handle_execute_order_shim;
 use super::initialise_fast_market_order::{
     initialise_fast_market_order, InitialiseFastMarketOrderData,
 };
@@ -27,7 +27,7 @@ pub enum FallbackMatchingEngineInstruction<'ix> {
     InitialiseFastMarketOrder(&'ix InitialiseFastMarketOrderData),
     CloseFastMarketOrder,
     PlaceInitialOfferCctpShim(&'ix PlaceInitialOfferCctpShimData),
-    // ExecuteOrderCctpShim,
+    ExecuteOrderCctpShim,
     // PrepareOrderResponseCctpShim(PrepareOrderResponseCctpShimData),
 }
 
@@ -50,10 +50,10 @@ pub fn process_instruction(
         }
         FallbackMatchingEngineInstruction::PlaceInitialOfferCctpShim(data) => {
             place_initial_offer_cctp_shim(accounts, data)
-        } // FallbackMatchingEngineInstruction::ExecuteOrderCctpShim => {
-          //     handle_execute_order_shim(accounts)
-          // }
-          // FallbackMatchingEngineInstruction::PrepareOrderResponseCctpShim(data) => {
+        }
+        FallbackMatchingEngineInstruction::ExecuteOrderCctpShim => {
+            handle_execute_order_shim(accounts)
+        } // FallbackMatchingEngineInstruction::PrepareOrderResponseCctpShim(data) => {
           //     prepare_order_response_cctp_shim(accounts, data)
           // }
     }
@@ -78,9 +78,9 @@ impl<'ix> FallbackMatchingEngineInstruction<'ix> {
             FallbackMatchingEngineInstruction::CLOSE_FAST_MARKET_ORDER_SELECTOR => {
                 Some(Self::CloseFastMarketOrder)
             }
-            // FallbackMatchingEngineInstruction::EXECUTE_ORDER_CCTP_SHIM_SELECTOR => {
-            //     Some(Self::ExecuteOrderCctpShim)
-            // }
+            FallbackMatchingEngineInstruction::EXECUTE_ORDER_CCTP_SHIM_SELECTOR => {
+                Some(Self::ExecuteOrderCctpShim)
+            }
             // FallbackMatchingEngineInstruction::PREPARE_ORDER_RESPONSE_CCTP_SHIM_SELECTOR => {
             //     Some(Self::PrepareOrderResponseCctpShim(
             //         PrepareOrderResponseCctpShimData::from_bytes(&instruction_data[8..]).unwrap(),
@@ -112,17 +112,17 @@ impl FallbackMatchingEngineInstruction<'_> {
 
                 out
             }
-            // Self::ExecuteOrderCctpShim => {
-            //     let total_capacity = 8; // 8 for the selector (no data)
+            Self::ExecuteOrderCctpShim => {
+                let total_capacity = 8; // 8 for the selector (no data)
 
-            //     let mut out = Vec::with_capacity(total_capacity);
+                let mut out = Vec::with_capacity(total_capacity);
 
-            //     out.extend_from_slice(
-            //         &FallbackMatchingEngineInstruction::EXECUTE_ORDER_CCTP_SHIM_SELECTOR,
-            //     );
+                out.extend_from_slice(
+                    &FallbackMatchingEngineInstruction::EXECUTE_ORDER_CCTP_SHIM_SELECTOR,
+                );
 
-            //     out
-            // }
+                out
+            }
             Self::InitialiseFastMarketOrder(data) => {
                 let data_slice = bytemuck::bytes_of(*data);
                 let total_capacity = 8_usize.saturating_add(data_slice.len()); // 8 for the selector, plus the data length

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

@@ -358,60 +358,60 @@ pub async fn test_place_initial_offer_non_shim_blocks_shim() {
     testing_engine.execute(instruction_triggers).await;
 }
 
-// #[tokio::test]
-// // Testing an execute order from arbitrum to ethereum
-// // TODO: Flesh out this test to see if the message was posted correctly
-// pub async fn test_execute_order_fallback() {
-//     let transfer_direction = TransferDirection::FromArbitrumToEthereum;
-//     let vaa_args = VaaArgs {
-//         post_vaa: false,
-//         ..VaaArgs::default()
-//     };
-//     let testing_context = setup_environment(
-//         ShimMode::VerifyAndPostSignature,
-//         transfer_direction,
-//         Some(vaa_args),
-//     )
-//     .await;
-//     let testing_engine = TestingEngine::new(testing_context).await;
-//     let instruction_triggers = vec![
-//         InstructionTrigger::InitializeProgram(InitializeInstructionConfig::default()),
-//         InstructionTrigger::CreateCctpRouterEndpoints(
-//             CreateCctpRouterEndpointsInstructionConfig::default(),
-//         ),
-//         InstructionTrigger::InitializeFastMarketOrderShim(
-//             InitializeFastMarketOrderShimInstructionConfig::default(),
-//         ),
-//         InstructionTrigger::PlaceInitialOfferShim(PlaceInitialOfferInstructionConfig::default()),
-//         InstructionTrigger::ExecuteOrderShim(ExecuteOrderInstructionConfig::default()),
-//     ];
-//     testing_engine.execute(instruction_triggers).await;
-// }
+#[tokio::test]
+// Testing an execute order from arbitrum to ethereum
+// TODO: Flesh out this test to see if the message was posted correctly
+pub async fn test_execute_order_fallback() {
+    let transfer_direction = TransferDirection::FromArbitrumToEthereum;
+    let vaa_args = VaaArgs {
+        post_vaa: false,
+        ..VaaArgs::default()
+    };
+    let testing_context = setup_environment(
+        ShimMode::VerifyAndPostSignature,
+        transfer_direction,
+        Some(vaa_args),
+    )
+    .await;
+    let testing_engine = TestingEngine::new(testing_context).await;
+    let instruction_triggers = vec![
+        InstructionTrigger::InitializeProgram(InitializeInstructionConfig::default()),
+        InstructionTrigger::CreateCctpRouterEndpoints(
+            CreateCctpRouterEndpointsInstructionConfig::default(),
+        ),
+        InstructionTrigger::InitializeFastMarketOrderShim(
+            InitializeFastMarketOrderShimInstructionConfig::default(),
+        ),
+        InstructionTrigger::PlaceInitialOfferShim(PlaceInitialOfferInstructionConfig::default()),
+        InstructionTrigger::ExecuteOrderShim(ExecuteOrderInstructionConfig::default()),
+    ];
+    testing_engine.execute(instruction_triggers).await;
+}
 
-// #[tokio::test]
-// pub async fn test_execute_order_shimless() {
-//     let transfer_direction = TransferDirection::FromArbitrumToEthereum;
-//     let vaa_args = VaaArgs {
-//         post_vaa: true,
-//         ..VaaArgs::default()
-//     };
-//     let testing_context = setup_environment(
-//         ShimMode::VerifyAndPostSignature,
-//         transfer_direction,
-//         Some(vaa_args),
-//     )
-//     .await;
-//     let testing_engine = TestingEngine::new(testing_context).await;
-//     let instruction_triggers = vec![
-//         InstructionTrigger::InitializeProgram(InitializeInstructionConfig::default()),
-//         InstructionTrigger::CreateCctpRouterEndpoints(
-//             CreateCctpRouterEndpointsInstructionConfig::default(),
-//         ),
-//         InstructionTrigger::PlaceInitialOfferShimless(PlaceInitialOfferInstructionConfig::default()),
-//         InstructionTrigger::ExecuteOrderShimless(ExecuteOrderInstructionConfig::default()),
-//     ];
-//     testing_engine.execute(instruction_triggers).await;
-// }
+#[tokio::test]
+pub async fn test_execute_order_shimless() {
+    let transfer_direction = TransferDirection::FromArbitrumToEthereum;
+    let vaa_args = VaaArgs {
+        post_vaa: true,
+        ..VaaArgs::default()
+    };
+    let testing_context = setup_environment(
+        ShimMode::VerifyAndPostSignature,
+        transfer_direction,
+        Some(vaa_args),
+    )
+    .await;
+    let testing_engine = TestingEngine::new(testing_context).await;
+    let instruction_triggers = vec![
+        InstructionTrigger::InitializeProgram(InitializeInstructionConfig::default()),
+        InstructionTrigger::CreateCctpRouterEndpoints(
+            CreateCctpRouterEndpointsInstructionConfig::default(),
+        ),
+        InstructionTrigger::PlaceInitialOfferShimless(PlaceInitialOfferInstructionConfig::default()),
+        InstructionTrigger::ExecuteOrderShimless(ExecuteOrderInstructionConfig::default()),
+    ];
+    testing_engine.execute(instruction_triggers).await;
+}
 // pub async fn test_execute_order_fallback_blocks_shimless() {
 //     let transfer_direction = TransferDirection::FromArbitrumToEthereum;
 //     let vaa_args = VaaArgs {

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

@@ -1,7 +1,7 @@
 #![allow(clippy::expect_used)]
 pub mod fast_market_order_shim;
 pub mod post_message;
-// pub mod shims_execute_order;
+pub mod shims_execute_order;
 pub mod shims_make_offer;
 // pub mod shims_prepare_order_response;
 pub mod verify_shim;

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

@@ -182,7 +182,7 @@ pub async fn execute_order_fallback(
 
     // Considering fast forwarding blocks here for deadline to be reached
     let recent_blockhash = test_ctx.borrow().last_blockhash;
-    utils::setup::fast_forward_slots(test_ctx, 3).await;
+    utils::setup::fast_forward_slots(&testing_context, 3).await;
     let transaction = Transaction::new_signed_with_payer(
         &[execute_order_ix],
         Some(&payer_signer.pubkey()),

solana/programs/matching-engine/tests/shimless/execute_order.rs

@@ -158,7 +158,7 @@ pub async fn execute_order_shimless_test(
     payer_signer: &Rc<Keypair>,
     expected_error: Option<&ExpectedError>,
 ) -> Option<ExecuteOrderShimlessFixture> {
-    crate::utils::setup::fast_forward_slots(&testing_context.test_context, 3).await;
+    crate::utils::setup::fast_forward_slots(&testing_context, 3).await;
     let fixture_accounts = testing_context
         .get_fixture_accounts()
         .expect("Fixture accounts not found");

solana/programs/matching-engine/tests/shimless/mod.rs

@@ -1,6 +1,6 @@
 #![allow(clippy::expect_used)]
 
-// pub mod execute_order;
+pub mod execute_order;
 pub mod initialize;
 pub mod make_offer;
 // pub mod prepare_order_response;