gavindiaz/sol-trade-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(raydium): optimize instruction builder with arrays and fast functions

Browse Source 
- Use fixed arrays instead of Vec for better performance
- Extract wSOL handling to common functions
- Apply fast variants of token account operations
- Pre-allocate capacities and optimize data construction
This commit is contained in:
ysq
2025-09-08 23:24:15 +08:00
parent 76a47e87b1
commit ccf6330260
1 changed files with 84 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/instruction/raydium_amm_v4.rs
+84 -114
View File
@@ -1,9 +1,3 @@
use anyhow::{anyhow, Result};
use solana_sdk::{instruction::Instruction, signer::Signer};
use solana_system_interface::instruction::transfer;
use spl_associated_token_account::instruction::create_associated_token_account_idempotent;
use spl_token::instruction::close_account;
use crate::{ use crate::{
constants::trade::trade::DEFAULT_SLIPPAGE, constants::trade::trade::DEFAULT_SLIPPAGE,
instruction::utils::raydium_amm_v4::{accounts, SWAP_BASE_IN_DISCRIMINATOR}, instruction::utils::raydium_amm_v4::{accounts, SWAP_BASE_IN_DISCRIMINATOR},
@@ -13,6 +7,11 @@ use crate::{
}, },
utils::calc::raydium_amm_v4::compute_swap_amount, utils::calc::raydium_amm_v4::compute_swap_amount,
}; };
use anyhow::{anyhow, Result};
use solana_sdk::{
instruction::{AccountMeta, Instruction},
signer::Signer,
};
/// Instruction builder for RaydiumCpmm protocol /// Instruction builder for RaydiumCpmm protocol
pub struct RaydiumAmmV4InstructionBuilder; pub struct RaydiumAmmV4InstructionBuilder;
@@ -29,11 +28,6 @@ impl InstructionBuilder for RaydiumAmmV4InstructionBuilder {
.downcast_ref::<RaydiumAmmV4Params>() .downcast_ref::<RaydiumAmmV4Params>()
.ok_or_else(|| anyhow!("Invalid protocol params for RaydiumCpmm"))?; .ok_or_else(|| anyhow!("Invalid protocol params for RaydiumCpmm"))?;
let wsol_token_account = spl_associated_token_account::get_associated_token_address(
&params.payer.pubkey(),
&crate::constants::WSOL_TOKEN_ACCOUNT,
);
let is_base_in = protocol_params.coin_mint == crate::constants::WSOL_TOKEN_ACCOUNT; let is_base_in = protocol_params.coin_mint == crate::constants::WSOL_TOKEN_ACCOUNT;
let amount_in: u64 = params.sol_amount; let amount_in: u64 = params.sol_amount;
@@ -46,91 +40,69 @@ impl InstructionBuilder for RaydiumAmmV4InstructionBuilder {
); );
let minimum_amount_out = swap_result.min_amount_out; let minimum_amount_out = swap_result.min_amount_out;
let mut instructions = vec![]; let mut instructions = Vec::with_capacity(6);
if protocol_params.auto_handle_wsol { if protocol_params.auto_handle_wsol {
// Handle wSOL // Handle wSOL
instructions.push( instructions
// Create wSOL ATA account if it doesn't exist .extend(crate::trading::common::handle_wsol(&params.payer.pubkey(), amount_in));
create_associated_token_account_idempotent(
&params.payer.pubkey(),
&params.payer.pubkey(),
&crate::constants::WSOL_TOKEN_ACCOUNT,
&crate::constants::TOKEN_PROGRAM,
),
);
instructions.push(
// Transfer SOL to wSOL ATA account
transfer(&params.payer.pubkey(), &wsol_token_account, amount_in),
);
// Sync wSOL balance
instructions.push(
spl_token::instruction::sync_native(
&crate::constants::TOKEN_PROGRAM,
&wsol_token_account,
)
.unwrap(),
);
} }
instructions.push(create_associated_token_account_idempotent( instructions.push(crate::common::fast_fn::create_associated_token_account_idempotent_fast(
&params.payer.pubkey(), &params.payer.pubkey(),
&params.payer.pubkey(), &params.payer.pubkey(),
&params.mint, &params.mint,
&crate::constants::TOKEN_PROGRAM, &crate::constants::TOKEN_PROGRAM,
)); ));
let user_source_token_account = spl_associated_token_account::get_associated_token_address( let user_source_token_account =
&params.payer.pubkey(), crate::common::fast_fn::get_associated_token_address_with_program_id_fast(
&crate::constants::WSOL_TOKEN_ACCOUNT, &params.payer.pubkey(),
); &crate::constants::WSOL_TOKEN_ACCOUNT,
&crate::constants::TOKEN_PROGRAM,
);
let user_destination_token_account = let user_destination_token_account =
spl_associated_token_account::get_associated_token_address( crate::common::fast_fn::get_associated_token_address_with_program_id_fast(
&params.payer.pubkey(), &params.payer.pubkey(),
&params.mint, &params.mint,
&crate::constants::TOKEN_PROGRAM,
); );
// Create buy instruction // Create buy instruction
let accounts = vec![ let accounts: [AccountMeta; 17] = [
crate::constants::TOKEN_PROGRAM_META, // Token Program (readonly) crate::constants::TOKEN_PROGRAM_META, // Token Program (readonly)
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Amm AccountMeta::new(protocol_params.amm, false), // Amm
accounts::AUTHORITY_META, // Authority (readonly) accounts::AUTHORITY_META, // Authority (readonly)
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Amm Open Orders AccountMeta::new(protocol_params.amm, false), // Amm Open Orders
solana_sdk::instruction::AccountMeta::new(protocol_params.token_coin, false), // Pool Coin Token Account AccountMeta::new(protocol_params.token_coin, false), // Pool Coin Token Account
solana_sdk::instruction::AccountMeta::new(protocol_params.token_pc, false), // Pool Pc Token Account AccountMeta::new(protocol_params.token_pc, false), // Pool Pc Token Account
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Serum Program AccountMeta::new(protocol_params.amm, false), // Serum Program
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Serum Market AccountMeta::new(protocol_params.amm, false), // Serum Market
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Serum Bids AccountMeta::new(protocol_params.amm, false), // Serum Bids
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Serum Asks AccountMeta::new(protocol_params.amm, false), // Serum Asks
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Serum Event Queue AccountMeta::new(protocol_params.amm, false), // Serum Event Queue
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Serum Coin Vault Account AccountMeta::new(protocol_params.amm, false), // Serum Coin Vault Account
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Serum Pc Vault Account AccountMeta::new(protocol_params.amm, false), // Serum Pc Vault Account
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Serum Vault Signer AccountMeta::new(protocol_params.amm, false), // Serum Vault Signer
solana_sdk::instruction::AccountMeta::new(user_source_token_account, false), // User Source Token Account AccountMeta::new(user_source_token_account, false), // User Source Token Account
solana_sdk::instruction::AccountMeta::new(user_destination_token_account, false), // User Destination Token Account AccountMeta::new(user_destination_token_account, false), // User Destination Token Account
solana_sdk::instruction::AccountMeta::new(params.payer.pubkey(), true), // User Source Owner AccountMeta::new(params.payer.pubkey(), true), // User Source Owner
]; ];
// Create instruction data // Create instruction data
let mut data = vec![]; let mut data = [0u8; 17];
data.extend_from_slice(&SWAP_BASE_IN_DISCRIMINATOR); data[..1].copy_from_slice(&SWAP_BASE_IN_DISCRIMINATOR);
data.extend_from_slice(&amount_in.to_le_bytes()); data[1..9].copy_from_slice(&amount_in.to_le_bytes());
data.extend_from_slice(&minimum_amount_out.to_le_bytes()); data[9..17].copy_from_slice(&minimum_amount_out.to_le_bytes());
instructions.push(Instruction { program_id: accounts::RAYDIUM_AMM_V4, accounts, data }); instructions.push(Instruction::new_with_bytes(
accounts::RAYDIUM_AMM_V4,
&data,
accounts.to_vec(),
));
if protocol_params.auto_handle_wsol { if protocol_params.auto_handle_wsol {
// Close wSOL ATA account, reclaim rent // Close wSOL ATA account, reclaim rent
instructions.push( instructions.push(crate::trading::common::close_wsol(&params.payer.pubkey()));
spl_token::instruction::close_account(
&crate::constants::TOKEN_PROGRAM,
&wsol_token_account,
&params.payer.pubkey(),
&params.payer.pubkey(),
&[],
)
.unwrap(),
);
} }
Ok(instructions) Ok(instructions)
@@ -147,11 +119,6 @@ impl InstructionBuilder for RaydiumAmmV4InstructionBuilder {
return Err(anyhow!("Token amount is not set")); return Err(anyhow!("Token amount is not set"));
} }
let wsol_token_account = spl_associated_token_account::get_associated_token_address(
&params.payer.pubkey(),
&crate::constants::WSOL_TOKEN_ACCOUNT,
);
let is_base_in = protocol_params.pc_mint == crate::constants::WSOL_TOKEN_ACCOUNT; let is_base_in = protocol_params.pc_mint == crate::constants::WSOL_TOKEN_ACCOUNT;
let swap_result = compute_swap_amount( let swap_result = compute_swap_amount(
protocol_params.coin_reserve, protocol_params.coin_reserve,
@@ -162,12 +129,12 @@ impl InstructionBuilder for RaydiumAmmV4InstructionBuilder {
); );
let minimum_amount_out = swap_result.min_amount_out; let minimum_amount_out = swap_result.min_amount_out;
let mut instructions = vec![]; let mut instructions = Vec::with_capacity(3);
// Handle wSOL // Handle wSOL
instructions.push( instructions.push(
// Create wSOL ATA account if it doesn't exist // Create wSOL ATA account if it doesn't exist
create_associated_token_account_idempotent( crate::common::fast_fn::create_associated_token_account_idempotent_fast(
&params.payer.pubkey(), &params.payer.pubkey(),
&params.payer.pubkey(), &params.payer.pubkey(),
&crate::constants::WSOL_TOKEN_ACCOUNT, &crate::constants::WSOL_TOKEN_ACCOUNT,
@@ -175,55 +142,58 @@ impl InstructionBuilder for RaydiumAmmV4InstructionBuilder {
), ),
); );
let user_source_token_account = spl_associated_token_account::get_associated_token_address( let user_source_token_account =
&params.payer.pubkey(), crate::common::fast_fn::get_associated_token_address_with_program_id_fast(
&params.mint, &params.payer.pubkey(),
); &params.mint,
&crate::constants::TOKEN_PROGRAM,
);
let user_destination_token_account = let user_destination_token_account =
spl_associated_token_account::get_associated_token_address( crate::common::fast_fn::get_associated_token_address_with_program_id_fast(
&params.payer.pubkey(), &params.payer.pubkey(),
&crate::constants::WSOL_TOKEN_ACCOUNT, &crate::constants::WSOL_TOKEN_ACCOUNT,
&crate::constants::TOKEN_PROGRAM,
); );
// Create buy instruction // Create buy instruction
let accounts = vec![ let accounts: [AccountMeta; 17] = [
crate::constants::TOKEN_PROGRAM_META, // Token Program (readonly) crate::constants::TOKEN_PROGRAM_META, // Token Program (readonly)
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Amm AccountMeta::new(protocol_params.amm, false), // Amm
accounts::AUTHORITY_META, // Authority (readonly) accounts::AUTHORITY_META, // Authority (readonly)
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Amm Open Orders AccountMeta::new(protocol_params.amm, false), // Amm Open Orders
solana_sdk::instruction::AccountMeta::new(protocol_params.token_coin, false), // Pool Coin Token Account AccountMeta::new(protocol_params.token_coin, false), // Pool Coin Token Account
solana_sdk::instruction::AccountMeta::new(protocol_params.token_pc, false), // Pool Pc Token Account AccountMeta::new(protocol_params.token_pc, false), // Pool Pc Token Account
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Serum Program AccountMeta::new(protocol_params.amm, false), // Serum Program
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Serum Market AccountMeta::new(protocol_params.amm, false), // Serum Market
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Serum Bids AccountMeta::new(protocol_params.amm, false), // Serum Bids
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Serum Asks AccountMeta::new(protocol_params.amm, false), // Serum Asks
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Serum Event Queue AccountMeta::new(protocol_params.amm, false), // Serum Event Queue
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Serum Coin Vault Account AccountMeta::new(protocol_params.amm, false), // Serum Coin Vault Account
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Serum Pc Vault Account AccountMeta::new(protocol_params.amm, false), // Serum Pc Vault Account
solana_sdk::instruction::AccountMeta::new(protocol_params.amm, false), // Serum Vault Signer AccountMeta::new(protocol_params.amm, false), // Serum Vault Signer
solana_sdk::instruction::AccountMeta::new(user_source_token_account, false), // User Source Token Account AccountMeta::new(user_source_token_account, false), // User Source Token Account
solana_sdk::instruction::AccountMeta::new(user_destination_token_account, false), // User Destination Token Account AccountMeta::new(user_destination_token_account, false), // User Destination Token Account
solana_sdk::instruction::AccountMeta::new(params.payer.pubkey(), true), // User Source Owner AccountMeta::new(params.payer.pubkey(), true), // User Source Owner
]; ];
// Create instruction data // Create instruction data
let mut data = vec![]; let mut data = [0u8; 17];
data.extend_from_slice(&SWAP_BASE_IN_DISCRIMINATOR); data[..1].copy_from_slice(&SWAP_BASE_IN_DISCRIMINATOR);
data.extend_from_slice(&params.token_amount.unwrap_or(0).to_le_bytes()); data[1..9].copy_from_slice(&params.token_amount.unwrap_or(0).to_le_bytes());
data.extend_from_slice(&minimum_amount_out.to_le_bytes()); data[9..17].copy_from_slice(&minimum_amount_out.to_le_bytes());
instructions.push(Instruction { program_id: accounts::RAYDIUM_AMM_V4, accounts, data }); // let mut data = vec![];
// data.extend_from_slice(&SWAP_BASE_IN_DISCRIMINATOR);
// data.extend_from_slice(&amount_in.to_le_bytes());
// data.extend_from_slice(&minimum_amount_out.to_le_bytes());
instructions.push(Instruction::new_with_bytes(
accounts::RAYDIUM_AMM_V4,
&data,
accounts.to_vec(),
));
if protocol_params.auto_handle_wsol { if protocol_params.auto_handle_wsol {
instructions.push( instructions.push(crate::trading::common::close_wsol(&params.payer.pubkey()));
close_account(
&crate::constants::TOKEN_PROGRAM,
&wsol_token_account,
&params.payer.pubkey(),
&params.payer.pubkey(),
&[&params.payer.pubkey()],
)
.unwrap(),
);
} }
Ok(instructions) Ok(instructions)