improved place initial offer shim

Author: Bengt Lofgren

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

@@ -22,21 +22,11 @@ use crate::error::MatchingEngineError;
 #[repr(C)]
 pub struct PlaceInitialOfferCctpShimData {
     pub offer_price: u64,
-    pub sequence: u64,
-    pub vaa_time: u32,
-    pub consistency_level: u8,
-    _padding: [u8; 3],
 }
 
 impl PlaceInitialOfferCctpShimData {
-    pub fn new(offer_price: u64, sequence: u64, vaa_time: u32, consistency_level: u8) -> Self {
-        Self {
-            offer_price,
-            sequence,
-            vaa_time,
-            consistency_level,
-            _padding: [0_u8; 3],
-        }
+    pub fn new(offer_price: u64) -> Self {
+        Self { offer_price }
     }
 
     pub fn from_bytes(data: &[u8]) -> Option<&Self> {
@@ -193,13 +183,7 @@ pub fn place_initial_offer_cctp_shim(
     check_account_length(accounts, 11)?;
     // Extract data fields
     // TODO: Remove sequence, vaa_time because they are in the fast market order state
-    let PlaceInitialOfferCctpShimData {
-        offer_price,
-        sequence,
-        vaa_time,
-        consistency_level,
-        _padding,
-    } = *data;
+    let PlaceInitialOfferCctpShimData { offer_price } = *data;
 
     let signer = &accounts[0];
     let transfer_authority = &accounts[1];
@@ -217,6 +201,10 @@ pub fn place_initial_offer_cctp_shim(
     let fast_market_order_zero_copy =
         FastMarketOrderState::try_deserialize(&mut &fast_market_order_account.data.borrow()[..])?;
 
+    let vaa_time = fast_market_order_zero_copy.vaa_timestamp;
+    let sequence = fast_market_order_zero_copy.vaa_sequence;
+    let consistency_level = fast_market_order_zero_copy.vaa_consistency_level;
+
     // Check pda of the transfer authority is valid
     let transfer_authority_seeds = [
         TRANSFER_AUTHORITY_SEED_PREFIX,

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

@@ -2,9 +2,9 @@
 #![allow(clippy::result_large_err)]
 
 mod composite;
-// use composite::*;
+use composite::*;
 
-pub mod error;
+mod error;
 
 mod events;
 
@@ -480,9 +480,9 @@ pub mod matching_engine {
     }
 
     /// UNUSED. This instruction does not exist and has never existed. It just reverts and exist to expose an account lol.
-    // pub fn get_cctp_mint_recipient(_ctx: Context<CctpMintRecipientMut>) -> Result<()> {
-    //     err!(ErrorCode::InstructionMissing)
-    // }
+    pub fn get_cctp_mint_recipient(_ctx: Context<CctpMintRecipientMut>) -> Result<()> {
+        err!(ErrorCode::InstructionMissing)
+    }
 
     /// Non anchor function for placing an initial offer using the VAA shim.
     pub fn fallback_process_instruction(

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

@@ -82,12 +82,7 @@ pub async fn place_initial_offer_fallback(
 
     let solver_usdc_balance_before = solver.get_balance(test_ctx).await;
 
-    let place_initial_offer_ix_data = PlaceInitialOfferCctpShimFallbackData::new(
-        offer_price,
-        vaa_data.sequence,
-        vaa_data.vaa_time,
-        vaa_data.consistency_level,
-    );
+    let place_initial_offer_ix_data = PlaceInitialOfferCctpShimFallbackData::new(offer_price);
 
     let place_initial_offer_ix_accounts = PlaceInitialOfferCctpShimFallbackAccounts {
         signer: &payer_signer.pubkey(),

solana/programs/matching-engine/tests/testing_engine/config.rs

@@ -26,13 +26,15 @@ pub struct InitializeInstructionConfig {
 
 pub struct CreateCctpRouterEndpointsInstructionConfig {
     pub chains: HashSet<Chain>,
+    pub admin_owner_or_assistant: Option<Rc<Keypair>>,
     pub expected_error: Option<ExpectedError>,
 }
 
 impl Default for CreateCctpRouterEndpointsInstructionConfig {
     fn default() -> Self {
         Self {
             chains: HashSet::from([Chain::Ethereum, Chain::Arbitrum, Chain::Solana]),
+            admin_owner_or_assistant: None,
             expected_error: None,
         }
     }

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

@@ -17,6 +17,7 @@ use crate::utils::{
     setup::TestingContext,
 };
 use anchor_lang::prelude::*;
+use solana_sdk::signature::Signer;
 
 #[allow(dead_code)]
 pub enum InstructionTrigger {
@@ -209,11 +210,15 @@ impl TestingEngine {
             .expect("Testing state is not initialized");
         let custodian_address = initialized_state.custodian_address;
         let testing_actors = &self.testing_context.testing_actors;
+        let admin_owner_or_assistant = config
+            .admin_owner_or_assistant
+            .clone()
+            .unwrap_or_else(|| testing_actors.owner.keypair());
         let result = create_all_router_endpoints_test(
             &self.testing_context,
-            testing_actors.owner.pubkey(),
+            admin_owner_or_assistant.pubkey(),
             custodian_address,
-            testing_actors.owner.keypair(),
+            admin_owner_or_assistant,
             config.chains.clone(),
         )
         .await;

solana/programs/matching-engine/tests/utils/constants.rs

@@ -115,17 +115,6 @@ pub fn get_player_one_keypair() -> Keypair {
 
 pub const ETHEREUM_USDC_ADDRESS: &str = "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48";
 
-// Chain to cctp domain mapping
-pub const CHAIN_TO_DOMAIN: &[(Chain, u32)] = &[
-    (Chain::Ethereum, 0),
-    (Chain::Avalanche, 1),
-    (Chain::Optimism, 2),
-    (Chain::Arbitrum, 3),
-    (Chain::Solana, 5),
-    (Chain::Base, 6),
-    (Chain::Polygon, 7),
-];
-
 // Enum for Chain types
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum Chain {
@@ -150,6 +139,18 @@ impl Chain {
             Chain::Polygon => 6,
         }
     }
+
+    pub fn as_cctp_domain(&self) -> u32 {
+        match self {
+            Chain::Ethereum => 0,
+            Chain::Avalanche => 1,
+            Chain::Optimism => 2,
+            Chain::Arbitrum => 3,
+            Chain::Solana => 5,
+            Chain::Base => 6,
+            Chain::Polygon => 7,
+        }
+    }
 }
 
 // Registered Token Routers

solana/programs/matching-engine/tests/utils/router.rs

@@ -189,7 +189,7 @@ pub async fn add_cctp_router_endpoint_ix(
     let ix_data = AddCctpRouterEndpoint {
         args: AddCctpRouterEndpointArgs {
             chain: chain.as_chain_id(),
-            cctp_domain: CHAIN_TO_DOMAIN[chain.as_index()].1,
+            cctp_domain: chain.as_cctp_domain(),
             address: registered_token_router_address,
             mint_recipient: None,
         },
@@ -237,7 +237,7 @@ pub async fn add_cctp_router_endpoint_ix(
         &Pubkey::new_from_array(registered_token_router_address),
         None,
         matching_engine::state::MessageProtocol::Cctp {
-            domain: CHAIN_TO_DOMAIN[chain.as_index()].1,
+            domain: chain.as_cctp_domain(),
         },
     );
     test_router_endpoint
@@ -334,7 +334,7 @@ pub async fn create_cctp_router_endpoint(
 ) -> TestRouterEndpoint {
     let fixture_accounts = testing_context.get_fixture_accounts().unwrap();
     let program_id = testing_context.get_matching_engine_program_id();
-    let token_messenger = match chain {
+    let remote_token_messenger = match chain {
         Chain::Arbitrum => fixture_accounts.arbitrum_remote_token_messenger,
         Chain::Ethereum => fixture_accounts.ethereum_remote_token_messenger,
         _ => {
@@ -348,7 +348,7 @@ pub async fn create_cctp_router_endpoint(
         custodian_address,
         admin_keypair.as_ref(),
         program_id,
-        token_messenger,
+        remote_token_messenger,
         chain,
     )
     .await

solana/programs/matching-engine/tests/utils/vaa.rs

@@ -7,7 +7,6 @@ use wormhole_svm_definitions::GUARDIAN_SIGNATURE_LENGTH;
 
 use super::constants::Chain;
 use super::setup::TestingContext;
-use super::CHAIN_TO_DOMAIN;
 
 use super::constants::CORE_BRIDGE_PID;
 use borsh::{BorshDeserialize, BorshSerialize};
@@ -409,8 +408,8 @@ pub fn create_deposit_message(
     let deposit = Deposit {
         token_address: token_mint.to_bytes(),
         amount: ruint::aliases::U256::from(amount),
-        source_cctp_domain: CHAIN_TO_DOMAIN[source_address.chain.as_index()].1,
-        destination_cctp_domain: CHAIN_TO_DOMAIN[Chain::Solana.as_index()].1, // Hardcode solana as destination domain
+        source_cctp_domain: source_address.chain.as_cctp_domain(),
+        destination_cctp_domain: Chain::Solana.as_cctp_domain(), // Hardcode solana as destination domain
         cctp_nonce,
         burn_source: source_address.address.to_bytes(), // Token router address
         mint_recipient: cctp_mint_recipient.to_bytes(), // Mint recipient program id