chore: anchor build successful with solana-cli v1.17.31

Author: St0rmBr3w

examples/oft-solana-composer-library/programs/composer/src/instructions/init_composer.rs

@@ -9,11 +9,21 @@ pub struct InitComposer<'info> {
         init,
         payer = payer,
         space = Composer::SIZE,
-        seeds = [LZ_COMPOSE_TYPES_SEED, payer.key().as_ref(), &[params.id]],
+        seeds = [COMPOSER_SEED, params.oft.as_ref()],
         bump
     )]
     pub composer: Account<'info, Composer>,
 
+    /// The LzComposeTypesAccounts account, storing extra addresses required for lz_compose_types.
+    #[account(
+        init,
+        payer = payer,
+        space = LzComposeTypesAccounts::SIZE,
+        seeds = [LZ_COMPOSE_TYPES_SEED, composer.key().as_ref()],
+        bump
+    )]
+    pub lz_compose_types_accounts: Account<'info, LzComposeTypesAccounts>,
+
     #[account(mut)]
     pub payer: Signer<'info>,
 
@@ -33,6 +43,12 @@ impl InitComposer<'_> {
         let composer = &mut ctx.accounts.composer;
         composer.oft = params.oft;
         composer.endpoint_program = params.endpoint_program;
+        composer.bump = ctx.bumps.composer;
+
+        // Initialize lz_compose_types_accounts with the composer address.
+        let lz_accounts = &mut ctx.accounts.lz_compose_types_accounts;
+        lz_accounts.composer = composer.key();
+        // Other fields in LzComposeTypesAccounts can be set as needed.
         Ok(())
     }
 }

examples/oft-solana-composer-library/programs/composer/src/instructions/lz_compose.rs

@@ -2,15 +2,18 @@ use crate::*;
 use anchor_lang::prelude::*;
 use anchor_spl::token::{Token};
 use anchor_spl::token_interface::{Token2022, TokenAccount, Mint};
+
 use raydium_clmm_cpi::cpi::accounts::SwapSingleV2;
 use raydium_clmm_cpi::cpi::swap_v2;
 use raydium_clmm_cpi::{
     program::RaydiumClmm,
     states::{AmmConfig, ObservationState, PoolState},
 };
+
 use oapp::endpoint::{instructions::ClearComposeParams, ID as ENDPOINT_ID};
 use oapp::endpoint_cpi::clear_compose;
 use oapp::LzComposeParams;
+
 use spl_memo;
 
 #[derive(Accounts)]
@@ -88,6 +91,10 @@ pub struct LzCompose<'info> {
 
 impl LzCompose<'_> {
     pub fn apply(ctx: &mut Context<LzCompose>, params: &LzComposeParams) -> Result<()> {
+        // Validate that the message is coming from the expected OFT and addressed to this composer.
+        require!(params.from == ctx.accounts.composer.oft, ComposerError::InvalidFrom);
+        require!(params.to == ctx.accounts.composer.key(), ComposerError::InvalidTo);
+
         let msg = &params.message;
         // Decode input amount from bytes 32..40.
         let amount_ld = u64::from_be_bytes(msg[32..40].try_into().unwrap());
@@ -131,7 +138,7 @@ impl LzCompose<'_> {
 
         swap_v2(cpi_ctx, amount_ld, min_amount_out, 0u128, true)?;
 
-        // Use the stored "oft" field as the seed instead of a non-existent “id”.
+        // Use the stored "oft" field as the seed.
         let seeds: &[&[u8]] = &[
             COMPOSER_SEED,
             &ctx.accounts.composer.oft.to_bytes(),

examples/oft-solana-composer-library/programs/composer/src/instructions/lz_compose_types.rs

@@ -2,10 +2,12 @@ use anchor_lang::prelude::*;
 use anchor_spl::token::{Token};
 use anchor_spl::token_interface::{Token2022, TokenAccount, Mint};
 use spl_memo;
+
 use raydium_clmm_cpi::{
     program::RaydiumClmm,
     states::{AmmConfig, ObservationState, PoolState},
 };
+
 use oapp::endpoint_cpi::{get_accounts_for_clear_compose, LzAccount};
 use oapp::{endpoint::ID as ENDPOINT_ID, LzComposeParams};
 
@@ -16,17 +18,12 @@ pub struct LzComposeTypes<'info> {
     pub payer: Signer<'info>,
     #[account(address = pool_state.load()?.amm_config)]
     pub amm_config: Box<Account<'info, AmmConfig>>,
-    #[account(mut)]
     pub pool_state: AccountLoader<'info, PoolState>,
-    #[account(mut)]
     pub input_token_account: Box<InterfaceAccount<'info, TokenAccount>>,
-    #[account(mut)]
     pub output_token_account: Box<InterfaceAccount<'info, TokenAccount>>,
-    #[account(mut)]
     pub input_vault: Box<InterfaceAccount<'info, TokenAccount>>,
-    #[account(mut)]
     pub output_vault: Box<InterfaceAccount<'info, TokenAccount>>,
-    #[account(mut, address = pool_state.load()?.observation_key)]
+    #[account(address = pool_state.load()?.observation_key)]
     pub observation_state: AccountLoader<'info, ObservationState>,
     pub token_program: Program<'info, Token>,
     pub token_program_2022: Program<'info, Token2022>,
@@ -36,34 +33,25 @@ pub struct LzComposeTypes<'info> {
     pub input_vault_mint: Box<InterfaceAccount<'info, Mint>>,
     #[account(address = output_vault.mint)]
     pub output_vault_mint: Box<InterfaceAccount<'info, Mint>>,
-    // Extra accounts required for the clear_compose call.
     /// The LayerZero endpoint program.
     pub lz_program: AccountInfo<'info>,
     /// The authority account for the swap.
     pub authority: AccountInfo<'info>,
     /// Tick array accounts for the swap range.
-    #[account(mut)]
     pub tick_array_lower: AccountInfo<'info>,
-    #[account(mut)]
     pub tick_array_current: AccountInfo<'info>,
-    #[account(mut)]
     pub tick_array_upper: AccountInfo<'info>,
 }
 
 impl LzComposeTypes<'_> {
-    /// Generates the list of LzAccounts expected by the clear_compose call.
+    /// Generates the ordered list of LzAccounts expected by the clear_compose call.
+    /// Base accounts for the swap are listed first, followed by extra accounts.
     pub fn apply(
         ctx: &Context<LzComposeTypes>,
         params: &LzComposeParams,
     ) -> Result<Vec<LzAccount>> {
-        let mut accounts = get_accounts_for_clear_compose(
-            ENDPOINT_ID,
-            &params.from,
-            &ctx.accounts.lz_program.key(),
-            &params.guid,
-            params.index,
-            &params.message,
-        );
+        let mut accounts = Vec::new();
+        // Base accounts for swap operations.
         accounts.push(LzAccount {
             pubkey: ctx.accounts.payer.key(),
             is_signer: true,
@@ -109,6 +97,33 @@ impl LzComposeTypes<'_> {
             is_signer: false,
             is_writable: true,
         });
+        accounts.push(LzAccount {
+            pubkey: ctx.accounts.tick_array_lower.key(),
+            is_signer: false,
+            is_writable: true,
+        });
+        accounts.push(LzAccount {
+            pubkey: ctx.accounts.tick_array_current.key(),
+            is_signer: false,
+            is_writable: true,
+        });
+        accounts.push(LzAccount {
+            pubkey: ctx.accounts.tick_array_upper.key(),
+            is_signer: false,
+            is_writable: true,
+        });
+
+        // Append additional accounts required for clear_compose.
+        let mut extra_accounts = get_accounts_for_clear_compose(
+            ENDPOINT_ID,
+            &params.from,
+            &ctx.accounts.lz_program.key(),
+            &params.guid,
+            params.index,
+            &params.message,
+        );
+        accounts.append(&mut extra_accounts);
+        
         Ok(accounts)
     }
 }

examples/oft-solana-composer-library/programs/composer/src/lib.rs

@@ -3,7 +3,9 @@ mod state;
 
 use anchor_lang::prelude::*;
 use instructions::*;
+
 use oapp::{endpoint_cpi::LzAccount, LzComposeParams};
+
 use state::*;
 
 declare_id!("3NJ7AUBaj9N8kBsRqA7SYWJ1poEUsEW36gCG1EfLDkW2");

examples/oft-solana-composer-library/programs/composer/src/state/composer.rs

@@ -15,7 +15,7 @@ impl Composer {
     pub const SIZE: usize = 8 + 32 + 32 + 1;
 }
 
-/// LzComposeTypesAccounts includes the pubkeys of all accounts used in the LzComposeTypes instruction.
+/// LzComposeTypesAccounts includes the pubkeys of all accounts used in the lz_compose_types instruction.
 /// (Adjust the fields as needed.)
 #[account]
 pub struct LzComposeTypesAccounts {
@@ -44,3 +44,11 @@ pub struct LzComposeTypesAccounts {
 impl LzComposeTypesAccounts {
     pub const SIZE: usize = 8 + std::mem::size_of::<Self>();
 }
+
+#[error_code]
+pub enum ComposerError {
+    #[msg("Invalid 'from' address. The message sender is not the expected OFT PDA.")]
+    InvalidFrom,
+    #[msg("Invalid 'to' address. The message recipient does not match the composer PDA.")]
+    InvalidTo,
+}