address shimful directory comments. Added ability to create transaction with compute unit price and compute unit limit

Author: Bengt Lofgren

solana/modules/matching-engine-testing/tests/shimful/README.md

@@ -1,11 +1,10 @@
 # Shimful Tests
 
-This directory contains tests that use the fallback program.
+This directory contains tests that use the fallback entrypoint of the matching engine program.
 
 ## Files
 
 - `fast_market_order_shim.rs` - A function that creates a fast market order account and one that closes it
 - `shims_make_offer.rs` - A function that places an initial offer and one that improves an offer
 - `shims_execute_order.rs` - A function that executes an order
 - `shims_prepare_order_response.rs` - A function that prepares an order response
-- `shims_settle_auction.rs` - A function that settles an auction

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

@@ -54,19 +54,17 @@ pub async fn initialise_fast_market_order_fallback(
         fast_market_order,
         guardian_signature_info,
     );
-    let recent_blockhash = testing_context
-        .get_new_latest_blockhash(test_context)
-        .await
-        .unwrap();
-    let transaction = solana_sdk::transaction::Transaction::new_signed_with_payer(
-        &[initialise_fast_market_order_ix],
-        Some(&payer_signer.pubkey()),
-        &[payer_signer],
-        recent_blockhash,
-    );
-    let versioned_transaction = VersionedTransaction::from(transaction);
+    let transaction = testing_context
+        .create_transaction(
+            &[initialise_fast_market_order_ix],
+            Some(&payer_signer.pubkey()),
+            &[payer_signer],
+            1000000000,
+            1000000000,
+        )
+        .await;
     testing_context
-        .execute_and_verify_transaction(test_context, versioned_transaction, expected_error)
+        .execute_and_verify_transaction(test_context, transaction, expected_error)
         .await;
 }
 

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

@@ -38,6 +38,7 @@ use anyhow::Result as AnyhowResult;
 use matching_engine::{CCTP_MINT_RECIPIENT, ID as PROGRAM_ID};
 use solana_program_test::{BanksClientError, ProgramTest, ProgramTestContext};
 use solana_sdk::clock::Clock;
+use solana_sdk::compute_budget::ComputeBudgetInstruction;
 use solana_sdk::instruction::InstructionError;
 use solana_sdk::transaction::{TransactionError, VersionedTransaction};
 use solana_sdk::{
@@ -377,6 +378,27 @@ impl TestingContext {
         Ok(())
     }
 
+    pub async fn create_transaction(
+        &self,
+        instructions: &[Instruction],
+        payer: Option<&Pubkey>,
+        signers: &[&Keypair],
+        compute_unit_price: u64,
+        compute_unit_limit: u64,
+    ) -> VersionedTransaction {
+        let last_blockhash = self.get_new_latest_blockhash(test_context).await;
+        let compute_budget_price =
+            ComputeBudgetInstruction::set_compute_unit_price(compute_unit_price);
+        let compute_budget_limit =
+            ComputeBudgetInstruction::set_compute_unit_limit(compute_unit_limit);
+        let instructions = [
+            &compute_budget_price,
+            &compute_budget_limit,
+            instructions.to_vec(),
+        ];
+        Transaction::new_signed_with_payer(instructions, payer, signers, last_blockhash)
+    }
+
     // TODO: Edit to handle multiple instructions in a single transaction
     pub async fn execute_and_verify_transaction(
         &self,

solana/modules/matching-engine-testing/tests/utils/account_fixtures.rs

@@ -51,7 +51,7 @@ impl FixtureAccounts {
             core_guardian_set: add_account_from_file(program_test, "tests/fixtures/accounts/core_bridge/guardian_set_0.json").address,
             message_transmitter_config: add_account_from_file(program_test, "tests/fixtures/accounts/message_transmitter/message_transmitter_config.json").address,
             // matching_engine_custodian: add_account_from_file(program_test, "tests/fixtures/accounts/testnet/matching_engine_custodian.json").address,
-            matching_engine_custodian: pubkey!("5BsCKkzuZXLygduw6RorCqEB61AdzNkxp5VzQrFGzYWr"),
+            matching_engine_custodian: Pubkey::from_str("5BsCKkzuZXLygduw6RorCqEB61AdzNkxp5VzQrFGzYWr").unwrap(),
             token_router_custodian: add_account_from_file(program_test, "tests/fixtures/accounts/testnet/token_router_custodian.json").address,
             token_router_program: add_account_from_file(program_test, "tests/fixtures/accounts/testnet/token_router_program_data_hacked.json").address,
             arbitrum_remote_token_messenger: add_account_from_file(program_test, "tests/fixtures/accounts/token_messenger_minter/arbitrum_remote_token_messenger.json").address,