FastMarketOrderParams used in instruction data builder

Author: bengtlofgren

solana/Makefile

@@ -75,7 +75,7 @@ test-sbf:
 	cargo build-sbf --features mainnet
 ### Unfortunately we cannot saturate all CPUs to perform tests due to nondeterministic `RpcError`
 ### reverts. We constrain the number of threads when we run these tests.
-	cd modules/matching-engine-testing && cargo test-sbf --features mainnet -- --test-threads 1
+	cd modules/matching-engine-testing && cargo test-sbf --features mainnet -- --test-threads 5
 
 .PHONY: anchor-test
 anchor-test: anchor-test-setup

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

@@ -51,12 +51,13 @@ pub async fn initialize_fast_market_order_shimful(
     let program_id = &testing_context.get_matching_engine_program_id();
     let test_vaa_pair = current_state.get_test_vaa_pair(config.vaa_index);
     let fast_transfer_vaa = test_vaa_pair.fast_transfer_vaa.clone();
-    let fast_market_order = create_fast_market_order_state_from_vaa_data(
+    let fast_market_order_params = create_fast_market_order_params_from_vaa_data(
         &fast_transfer_vaa.vaa_data,
         config
             .close_account_refund_recipient
             .unwrap_or_else(|| testing_context.testing_actors.solvers[0].pubkey()),
     );
+    let fast_market_order = FastMarketOrderState::new(&fast_market_order_params);
     let payer_signer = config
         .payer_signer
         .clone()
@@ -75,7 +76,7 @@ pub async fn initialize_fast_market_order_shimful(
     let (fast_market_order_account, fast_market_order_bump) = Pubkey::find_program_address(
         &[
             FastMarketOrderState::SEED_PREFIX,
-            &fast_market_order.digest(),
+            &fast_market_order.digest().as_ref(),
             &fast_market_order.close_account_refund_recipient.as_ref(),
         ],
         program_id,
@@ -89,7 +90,7 @@ pub async fn initialize_fast_market_order_shimful(
     let initialize_fast_market_order_ix = initialize_fast_market_order_shimful_instruction(
         &payer_signer,
         program_id,
-        fast_market_order,
+        &fast_market_order_params,
         &guardian_signature_info,
         &from_endpoint,
     );
@@ -138,7 +139,7 @@ pub async fn initialize_fast_market_order_shimful(
 ///
 /// * `payer_signer` - The payer signer keypair
 /// * `program_id` - The program id
-/// * `fast_market_order` - The fast market order state
+/// * `fast_market_order_params` - The fast market order params
 /// * `guardian_signature_info` - Information about guardian signatures
 ///
 /// # Returns
@@ -147,14 +148,15 @@ pub async fn initialize_fast_market_order_shimful(
 pub fn initialize_fast_market_order_shimful_instruction(
     payer_signer: &Rc<Keypair>,
     program_id: &Pubkey,
-    fast_market_order: FastMarketOrderState,
+    fast_market_order_params: &FastMarketOrderParams,
     guardian_signature_info: &GuardianSignatureInfo,
     from_endpoint: &Pubkey,
 ) -> solana_program::instruction::Instruction {
+    let fast_market_order = FastMarketOrderState::new(fast_market_order_params);
     let fast_market_order_account = Pubkey::find_program_address(
         &[
             FastMarketOrderState::SEED_PREFIX,
-            &fast_market_order.digest(),
+            &fast_market_order.digest().as_ref(),
             &fast_market_order.close_account_refund_recipient.as_ref(),
         ],
         program_id,
@@ -164,7 +166,7 @@ pub fn initialize_fast_market_order_shimful_instruction(
     let create_fast_market_order_accounts = InitializeFastMarketOrderFallbackAccounts {
         payer: &payer_signer.pubkey(),
         new_fast_market_order: &fast_market_order_account,
-        guardian_set: &guardian_signature_info.guardian_set_pubkey,
+        wormhole_guardian_set: &guardian_signature_info.guardian_set_pubkey,
         shim_guardian_signatures: &guardian_signature_info.guardian_signatures_pubkey,
         from_endpoint,
         verify_vaa_shim_program: &WORMHOLE_VERIFY_VAA_SHIM_PID,
@@ -174,7 +176,7 @@ pub fn initialize_fast_market_order_shimful_instruction(
         program_id,
         accounts: create_fast_market_order_accounts,
         data: InitializeFastMarketOrderFallbackData::new(
-            fast_market_order,
+            fast_market_order_params,
             guardian_signature_info.guardian_set_bump,
         ),
     }
@@ -228,9 +230,9 @@ pub async fn close_fast_market_order_fallback(
         .await;
 }
 
-/// Create the fast market order state from the vaa data
+/// Create the fast market order params from the vaa data
 ///
-/// This function creates the fast market order state from the vaa data
+/// This function creates the fast market order params from the vaa data
 ///
 /// # Arguments
 ///
@@ -239,11 +241,11 @@ pub async fn close_fast_market_order_fallback(
 ///
 /// # Returns
 ///
-/// * `fast_market_order_state` - The fast market order state
-pub fn create_fast_market_order_state_from_vaa_data(
+/// * `fast_market_order_params` - The fast market order params
+pub fn create_fast_market_order_params_from_vaa_data(
     vaa_data: &utils::vaa::PostedVaaData,
     close_account_refund_recipient: Pubkey,
-) -> FastMarketOrderState {
+) -> FastMarketOrderParams {
     let vaa_message = matching_engine::fallback::place_initial_offer::VaaMessageBodyHeader::new(
         vaa_data.consistency_level,
         vaa_data.vaa_time,
@@ -267,7 +269,7 @@ pub fn create_fast_market_order_state_from_vaa_data(
 
         fixed_array
     };
-    let fast_market_order = FastMarketOrderState::new(FastMarketOrderParams {
+    let fast_market_order_params = FastMarketOrderParams {
         amount_in: order.amount_in,
         min_amount_out: order.min_amount_out,
         deadline: order.deadline,
@@ -285,13 +287,15 @@ pub fn create_fast_market_order_state_from_vaa_data(
         vaa_emitter_chain: vaa_data.emitter_chain,
         vaa_consistency_level: vaa_data.consistency_level,
         vaa_emitter_address: vaa_data.emitter_address,
-    });
+    };
 
-    assert_eq!(fast_market_order.redeemer, order.redeemer);
+    assert_eq!(fast_market_order_params.redeemer, order.redeemer);
     assert_eq!(
-        vaa_message.digest(&fast_market_order).as_ref(),
+        vaa_message
+            .digest(&FastMarketOrderState::new(&fast_market_order_params))
+            .as_ref(),
         vaa_data.digest().as_ref()
     );
 
-    fast_market_order
+    fast_market_order_params
 }

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

@@ -11,10 +11,10 @@ use matching_engine::fallback::place_initial_offer::{
     PlaceInitialOfferCctpShimAccounts as PlaceInitialOfferCctpShimFallbackAccounts,
     PlaceInitialOfferCctpShimData as PlaceInitialOfferCctpShimFallbackData,
 };
-use matching_engine::state::Auction;
+use matching_engine::state::{Auction, FastMarketOrder};
 use solana_program_test::ProgramTestContext;
 
-use super::fast_market_order_shim::create_fast_market_order_state_from_vaa_data;
+use super::fast_market_order_shim::create_fast_market_order_params_from_vaa_data;
 use solana_sdk::{pubkey::Pubkey, signer::Signer};
 
 /// Places an initial offer using the fallback program. The vaa is constructed from a passed in PostedVaaData struct. The nonce is forced to 0.
@@ -295,7 +295,10 @@ impl PlaceInitialOfferShimfulAccounts {
             .fast_transfer_vaa;
         let vaa_data = fast_transfer_vaa.get_vaa_data();
         let fast_market_order_state =
-            create_fast_market_order_state_from_vaa_data(vaa_data, close_account_refund_recipient);
+            FastMarketOrder::new(&create_fast_market_order_params_from_vaa_data(
+                vaa_data,
+                close_account_refund_recipient,
+            ));
         let offer_actor = config.actor.get_actor(&testing_context.testing_actors);
         let offer_token = match &config.custom_accounts {
             Some(custom_accounts) => match custom_accounts.offer_token_address {
@@ -309,7 +312,10 @@ impl PlaceInitialOfferShimfulAccounts {
                 .unwrap(),
         };
         let auction = Pubkey::find_program_address(
-            &[Auction::SEED_PREFIX, &fast_market_order_state.digest()],
+            &[
+                Auction::SEED_PREFIX,
+                &fast_market_order_state.digest().as_ref(),
+            ],
             &program_id,
         )
         .0;

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

@@ -384,7 +384,7 @@ impl PrepareOrderResponseShimAccountsHelper {
         let fast_market_order_digest = data.fast_market_order.digest();
         let prepared_order_response_seeds = [
             PreparedOrderResponse::SEED_PREFIX,
-            &fast_market_order_digest,
+            &fast_market_order_digest.as_ref(),
         ];
 
         let (prepared_order_response_pda, _prepared_order_response_bump) =

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

@@ -83,7 +83,8 @@ pub async fn test_place_initial_offer_shimful() {
             .fast_market_order()
             .unwrap()
             .fast_market_order
-            .digest(),
+            .digest()
+            .as_ref(),
         final_state
             .base()
             .vaas

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

@@ -21,7 +21,7 @@ use std::{
 };
 
 use crate::{
-    shimful::fast_market_order_shim::create_fast_market_order_state_from_vaa_data,
+    shimful::fast_market_order_shim::create_fast_market_order_params_from_vaa_data,
     shimless::initialize::AuctionParametersConfig,
     utils::{
         auction::{ActiveAuctionState, AuctionAccounts},
@@ -657,14 +657,15 @@ impl CombinedInstructionConfig {
     ) -> Self {
         let test_vaa_pair = current_state.get_test_vaa_pair(0);
         let fast_transfer_vaa = test_vaa_pair.fast_transfer_vaa.clone();
-        let fast_market_order = create_fast_market_order_state_from_vaa_data(
+        let fast_market_order_params = create_fast_market_order_params_from_vaa_data(
             &fast_transfer_vaa.vaa_data,
             testing_actors.solvers[0].pubkey(),
         );
+        let fast_market_order = FastMarketOrderState::new(&fast_market_order_params);
         let (fast_market_order_address, _fast_market_order_bump) = Pubkey::find_program_address(
             &[
                 FastMarketOrderState::SEED_PREFIX,
-                &fast_market_order.digest(),
+                &fast_market_order.digest().as_ref(),
                 &fast_market_order.close_account_refund_recipient.as_ref(),
             ],
             program_id,

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

@@ -33,7 +33,7 @@ use super::setup::TestingContext;
 use super::{config::*, state::*};
 use crate::shimful;
 use crate::shimful::fast_market_order_shim::{
-    create_fast_market_order_state_from_vaa_data, initialize_fast_market_order_shimful,
+    create_fast_market_order_params_from_vaa_data, initialize_fast_market_order_shimful,
     initialize_fast_market_order_shimful_instruction,
 };
 use crate::shimful::shims_make_offer::{
@@ -858,12 +858,13 @@ impl TestingEngine {
         let test_vaa_pair =
             current_state.get_test_vaa_pair(create_fast_market_order_config.vaa_index);
         let fast_transfer_vaa = test_vaa_pair.fast_transfer_vaa.clone();
-        let fast_market_order = create_fast_market_order_state_from_vaa_data(
+        let fast_market_order_params = create_fast_market_order_params_from_vaa_data(
             &fast_transfer_vaa.vaa_data,
             create_fast_market_order_config
                 .close_account_refund_recipient
                 .unwrap_or_else(|| self.testing_context.testing_actors.solvers[0].pubkey()),
         );
+        let fast_market_order = FastMarketOrder::new(&fast_market_order_params);
         let create_fast_market_order_payer_signer = create_fast_market_order_config
             .payer_signer
             .clone()
@@ -881,7 +882,7 @@ impl TestingEngine {
         let (fast_market_order_account, fast_market_order_bump) = Pubkey::find_program_address(
             &[
                 FastMarketOrder::SEED_PREFIX,
-                &fast_market_order.digest(),
+                &fast_market_order.digest().as_ref(),
                 &fast_market_order.close_account_refund_recipient.as_ref(),
             ],
             program_id,
@@ -895,7 +896,7 @@ impl TestingEngine {
         let create_fast_market_order_instruction = initialize_fast_market_order_shimful_instruction(
             &create_fast_market_order_payer_signer,
             program_id,
-            fast_market_order,
+            &fast_market_order_params,
             &guardian_signature_info,
             &from_endpoint_pubkey,
         );

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

@@ -213,7 +213,7 @@ pub(super) fn process(accounts: &[AccountInfo]) -> Result<()> {
     let active_auction_inner_info = active_auction.info.as_ref().unwrap();
 
     require!(
-        active_auction.vaa_hash == fast_market_order.digest(),
+        active_auction.vaa_hash == fast_market_order.digest().as_ref(),
         MatchingEngineError::VaaMismatch
     );
 

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

@@ -1,8 +1,12 @@
 use anchor_lang::{prelude::*, Discriminator};
 use bytemuck::{Pod, Zeroable};
-use solana_program::{instruction::Instruction, keccak};
+use solana_program::instruction::Instruction;
 
-use crate::{error::MatchingEngineError, state::FastMarketOrder, ID};
+use crate::{
+    error::MatchingEngineError,
+    state::{FastMarketOrder, FastMarketOrderParams},
+    ID,
+};
 
 const NUM_ACCOUNTS: usize = 7;
 
@@ -11,19 +15,18 @@ pub struct InitializeFastMarketOrderAccounts<'ix> {
     /// order account. This account will be the only authority allowed to
     /// close this account.
     pub payer: &'ix Pubkey, // 0
-
     /// The from router endpoint account for the hash of the fast market order
-    pub from_endpoint: &'ix Pubkey,
+    pub from_endpoint: &'ix Pubkey, // 1
+    /// The verify VAA shim program account
+    pub verify_vaa_shim_program: &'ix Pubkey, // 2
     /// Wormhole guardian set account used to check recovered pubkeys using
     /// [Self::guardian_set_signatures].
-    // TODO: Rename to "wormhole_guardian_set"
-    pub verify_vaa_shim_program: &'ix Pubkey, // 1
-    pub guardian_set: &'ix Pubkey, // 2
+    pub wormhole_guardian_set: &'ix Pubkey, // 3
     /// The guardian set signatures of fast market order VAA.
-    pub shim_guardian_signatures: &'ix Pubkey, // 3
+    pub shim_guardian_signatures: &'ix Pubkey, // 4
     /// The fast market order account pubkey (that is created by the
     /// instruction).
-    pub new_fast_market_order: &'ix Pubkey, // 4
+    pub new_fast_market_order: &'ix Pubkey, // 5
 }
 
 #[derive(Debug, Copy, Clone, Pod, Zeroable)]
@@ -39,10 +42,9 @@ pub struct InitializeFastMarketOrderData {
 
 impl InitializeFastMarketOrderData {
     // Adds the padding to the InitializeFastMarketOrderData
-    // TODO: change FastMarketOrder to FastMarketOrderParams.
-    pub fn new(fast_market_order: FastMarketOrder, guardian_set_bump: u8) -> Self {
+    pub fn new(fast_market_order_params: &FastMarketOrderParams, guardian_set_bump: u8) -> Self {
         Self {
-            fast_market_order,
+            fast_market_order: FastMarketOrder::new(fast_market_order_params),
             guardian_set_bump,
             _padding: Default::default(),
         }
@@ -70,7 +72,7 @@ impl InitializeFastMarketOrder<'_> {
             new_fast_market_order,
             from_endpoint,
 
-            guardian_set: wormhole_guardian_set,
+            wormhole_guardian_set,
             shim_guardian_signatures,
             verify_vaa_shim_program,
         } = self.accounts;
@@ -129,7 +131,7 @@ pub(super) fn process(
         3, // wormhole_guardian_set_index
         4, // shim_guardian_signatures_index
         data.guardian_set_bump,
-        keccak::Hash(fast_market_order_vaa_digest),
+        fast_market_order_vaa_digest,
         accounts,
     )?;
 
@@ -140,7 +142,7 @@ pub(super) fn process(
     let (expected_fast_market_order_key, fast_market_order_bump) = Pubkey::find_program_address(
         &[
             FastMarketOrder::SEED_PREFIX,
-            &fast_market_order_vaa_digest,
+            &fast_market_order_vaa_digest.as_ref(),
             fast_market_order.close_account_refund_recipient.as_ref(),
         ],
         &ID,
@@ -159,7 +161,7 @@ pub(super) fn process(
         &ID,
         &[&[
             FastMarketOrder::SEED_PREFIX,
-            &fast_market_order_vaa_digest,
+            &fast_market_order_vaa_digest.as_ref(),
             // TODO: Replace with payer_info.key.
             fast_market_order.close_account_refund_recipient.as_ref(),
             &[fast_market_order_bump],
@@ -193,11 +195,11 @@ mod test {
                 new_fast_market_order: &Default::default(),
                 from_endpoint: &Default::default(),
                 verify_vaa_shim_program: &Default::default(),
-                guardian_set: &Default::default(),
+                wormhole_guardian_set: &Default::default(),
                 shim_guardian_signatures: &Default::default(),
             },
             data: InitializeFastMarketOrderData::new(
-                FastMarketOrder::new(FastMarketOrderParams {
+                &FastMarketOrderParams {
                     amount_in: Default::default(),
                     min_amount_out: Default::default(),
                     deadline: Default::default(),
@@ -215,7 +217,7 @@ mod test {
                     vaa_emitter_chain: Default::default(),
                     vaa_consistency_level: Default::default(),
                     vaa_emitter_address: Default::default(),
-                }),
+                },
                 Default::default(),
             ),
         }

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

@@ -344,7 +344,7 @@ mod tests {
 
     #[test]
     fn test_bytemuck() {
-        let test_fast_market_order = FastMarketOrder::new(FastMarketOrderParams {
+        let test_fast_market_order = FastMarketOrder::new(&FastMarketOrderParams {
             amount_in: 1000000000000000000,
             min_amount_out: 1000000000000000000,
             deadline: 1000000000,