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

feat: swap support usdc quote

Browse Source
This commit is contained in:
tommggo
2025-10-08 20:08:19 +08:00
parent 2f5a63ed55
commit 9bb08bd567
10 changed files with 181 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/constants/accounts.rs
+10
View File
@@ -42,6 +42,16 @@ pub const USD1_TOKEN_ACCOUNT_META: solana_sdk::instruction::AccountMeta =
is_writable: false,
};
// USDC (mainnet) mint and meta
pub const USDC_TOKEN_ACCOUNT: Pubkey =
pubkey!("EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v");
pub const USDC_TOKEN_ACCOUNT_META: solana_sdk::instruction::AccountMeta =
solana_sdk::instruction::AccountMeta {
pubkey: USDC_TOKEN_ACCOUNT,
is_signer: false,
is_writable: false,
};
pub const RENT: Pubkey = solana_sdk::sysvar::rent::id();
pub const RENT_META: solana_sdk::instruction::AccountMeta =
solana_sdk::instruction::AccountMeta { pubkey: RENT, is_signer: false, is_writable: false };
src/instruction/meteora_damm_v2.rs
+33 -6
View File
@@ -29,10 +29,20 @@ impl InstructionBuilder for MeteoraDammV2InstructionBuilder {
.downcast_ref::<MeteoraDammV2Params>()
.ok_or_else(|| anyhow!("Invalid protocol params for RaydiumCpmm"))?;
// Whitelist: only allow WSOL/USDC as quote side
if protocol_params.token_a_mint != crate::constants::WSOL_TOKEN_ACCOUNT
&& protocol_params.token_b_mint != crate::constants::WSOL_TOKEN_ACCOUNT
&& protocol_params.token_a_mint != crate::constants::USDC_TOKEN_ACCOUNT
&& protocol_params.token_b_mint != crate::constants::USDC_TOKEN_ACCOUNT
{
return Err(anyhow!("Unsupported quote mint for Meteora DAMM v2"));
}
// ========================================
// Trade calculation and account address preparation
// ========================================
let is_a_in = protocol_params.token_a_mint == crate::constants::WSOL_TOKEN_ACCOUNT;
// Determine side A/B by comparing with actual input mint
let is_a_in = protocol_params.token_a_mint == params.input_mint;
let amount_in: u64 = params.input_amount.unwrap_or(0);
let minimum_amount_out: u64 = match params.fixed_output_amount {
Some(fixed) => fixed,
@@ -67,7 +77,9 @@ impl InstructionBuilder for MeteoraDammV2InstructionBuilder {
// ========================================
let mut instructions = Vec::with_capacity(6);
if params.create_input_mint_ata {
if params.create_input_mint_ata
&& params.input_mint == crate::constants::WSOL_TOKEN_ACCOUNT
{
instructions
.extend(crate::trading::common::handle_wsol(&params.payer.pubkey(), amount_in));
}
@@ -113,7 +125,9 @@ impl InstructionBuilder for MeteoraDammV2InstructionBuilder {
accounts.to_vec(),
));
if params.close_input_mint_ata {
if params.close_input_mint_ata
&& params.input_mint == crate::constants::WSOL_TOKEN_ACCOUNT
{
// Close wSOL ATA account, reclaim rent
instructions.extend(crate::trading::common::close_wsol(&params.payer.pubkey()));
}
@@ -131,6 +145,15 @@ impl InstructionBuilder for MeteoraDammV2InstructionBuilder {
.downcast_ref::<MeteoraDammV2Params>()
.ok_or_else(|| anyhow!("Invalid protocol params for RaydiumCpmm"))?;
// Whitelist: only allow WSOL/USDC as quote side
if protocol_params.token_a_mint != crate::constants::WSOL_TOKEN_ACCOUNT
&& protocol_params.token_b_mint != crate::constants::WSOL_TOKEN_ACCOUNT
&& protocol_params.token_a_mint != crate::constants::USDC_TOKEN_ACCOUNT
&& protocol_params.token_b_mint != crate::constants::USDC_TOKEN_ACCOUNT
{
return Err(anyhow!("Unsupported quote mint for Meteora DAMM v2"));
}
if params.input_amount.is_none() || params.input_amount.unwrap_or(0) == 0 {
return Err(anyhow!("Token amount is not set"));
}
@@ -138,7 +161,7 @@ impl InstructionBuilder for MeteoraDammV2InstructionBuilder {
// ========================================
// Trade calculation and account address preparation
// ========================================
let is_a_in = protocol_params.token_b_mint == crate::constants::WSOL_TOKEN_ACCOUNT;
let is_a_in = protocol_params.token_a_mint == params.input_mint;
let minimum_amount_out: u64 = match params.fixed_output_amount {
Some(fixed) => fixed,
None => return Err(anyhow!("fixed_output_amount must be set for MeteoraDammV2 swap")),
@@ -172,7 +195,9 @@ impl InstructionBuilder for MeteoraDammV2InstructionBuilder {
// ========================================
let mut instructions = Vec::with_capacity(3);
if params.create_output_mint_ata {
if params.create_output_mint_ata
&& params.output_mint == crate::constants::WSOL_TOKEN_ACCOUNT
{
instructions.extend(crate::trading::common::create_wsol_ata(&params.payer.pubkey()));
}
@@ -205,7 +230,9 @@ impl InstructionBuilder for MeteoraDammV2InstructionBuilder {
accounts.to_vec(),
));
if params.close_output_mint_ata {
if params.close_output_mint_ata
&& params.output_mint == crate::constants::WSOL_TOKEN_ACCOUNT
{
instructions.extend(crate::trading::common::close_wsol(&params.payer.pubkey()));
}
src/instruction/pumpswap.rs
+8 -6
View File
@@ -53,10 +53,11 @@ impl InstructionBuilder for PumpSwapInstructionBuilder {
let pool_base_token_account = protocol_params.pool_base_token_account;
let pool_quote_token_account = protocol_params.pool_quote_token_account;
if base_mint != crate::constants::WSOL_TOKEN_ACCOUNT
&& quote_mint != crate::constants::WSOL_TOKEN_ACCOUNT
// Only support WSOL or USDC as quote mint for now
if quote_mint != crate::constants::WSOL_TOKEN_ACCOUNT
&& quote_mint != crate::constants::USDC_TOKEN_ACCOUNT
{
return Err(anyhow!("Invalid base mint and quote mint"));
return Err(anyhow!("Unsupported quote mint for PumpSwap"));
}
// ========================================
@@ -219,10 +220,11 @@ impl InstructionBuilder for PumpSwapInstructionBuilder {
let base_token_program = protocol_params.base_token_program;
let quote_token_program = protocol_params.quote_token_program;
if base_mint != crate::constants::WSOL_TOKEN_ACCOUNT
&& quote_mint != crate::constants::WSOL_TOKEN_ACCOUNT
// Only support WSOL or USDC as quote mint for now
if quote_mint != crate::constants::WSOL_TOKEN_ACCOUNT
&& quote_mint != crate::constants::USDC_TOKEN_ACCOUNT
{
return Err(anyhow!("Invalid base mint and quote mint"));
return Err(anyhow!("Unsupported quote mint for PumpSwap"));
}
if params.input_amount.is_none() {
return Err(anyhow!("Token amount is not set"));
src/instruction/raydium_amm_v4.rs
+29 -8
View File
@@ -31,10 +31,18 @@ impl InstructionBuilder for RaydiumAmmV4InstructionBuilder {
.downcast_ref::<RaydiumAmmV4Params>()
.ok_or_else(|| anyhow!("Invalid protocol params for RaydiumCpmm"))?;
// Whitelist: only allow WSOL/USDC as quote (pc) mint
if protocol_params.pc_mint != crate::constants::WSOL_TOKEN_ACCOUNT
&& protocol_params.pc_mint != crate::constants::USDC_TOKEN_ACCOUNT
{
return Err(anyhow!("Unsupported quote mint for Raydium AMM v4"));
}
// ========================================
// Trade calculation and account address preparation
// ========================================
let is_base_in = protocol_params.coin_mint == crate::constants::WSOL_TOKEN_ACCOUNT;
// Determine direction based on actual input mint
let is_base_in = protocol_params.coin_mint == params.input_mint;
let amount_in: u64 = params.input_amount.unwrap_or(0);
let swap_result = compute_swap_amount(
protocol_params.coin_reserve,
@@ -51,7 +59,7 @@ impl InstructionBuilder for RaydiumAmmV4InstructionBuilder {
let user_source_token_account =
crate::common::fast_fn::get_associated_token_address_with_program_id_fast_use_seed(
&params.payer.pubkey(),
&crate::constants::WSOL_TOKEN_ACCOUNT,
&params.input_mint,
&crate::constants::TOKEN_PROGRAM,
params.open_seed_optimize,
);
@@ -68,7 +76,8 @@ impl InstructionBuilder for RaydiumAmmV4InstructionBuilder {
// ========================================
let mut instructions = Vec::with_capacity(6);
if params.create_input_mint_ata {
if params.create_input_mint_ata && params.input_mint == crate::constants::WSOL_TOKEN_ACCOUNT
{
instructions
.extend(crate::trading::common::handle_wsol(&params.payer.pubkey(), amount_in));
}
@@ -117,7 +126,8 @@ impl InstructionBuilder for RaydiumAmmV4InstructionBuilder {
accounts.to_vec(),
));
if params.close_input_mint_ata {
if params.close_input_mint_ata && params.input_mint == crate::constants::WSOL_TOKEN_ACCOUNT
{
// Close wSOL ATA account, reclaim rent
instructions.extend(crate::trading::common::close_wsol(&params.payer.pubkey()));
}
@@ -135,6 +145,13 @@ impl InstructionBuilder for RaydiumAmmV4InstructionBuilder {
.downcast_ref::<RaydiumAmmV4Params>()
.ok_or_else(|| anyhow!("Invalid protocol params for RaydiumCpmm"))?;
// Whitelist: only allow WSOL/USDC as quote (pc) mint
if protocol_params.pc_mint != crate::constants::WSOL_TOKEN_ACCOUNT
&& protocol_params.pc_mint != crate::constants::USDC_TOKEN_ACCOUNT
{
return Err(anyhow!("Unsupported quote mint for Raydium AMM v4"));
}
if params.input_amount.is_none() || params.input_amount.unwrap_or(0) == 0 {
return Err(anyhow!("Token amount is not set"));
}
@@ -142,7 +159,7 @@ impl InstructionBuilder for RaydiumAmmV4InstructionBuilder {
// ========================================
// Trade calculation and account address preparation
// ========================================
let is_base_in = protocol_params.pc_mint == crate::constants::WSOL_TOKEN_ACCOUNT;
let is_base_in = protocol_params.coin_mint == params.input_mint;
let swap_result = compute_swap_amount(
protocol_params.coin_reserve,
protocol_params.pc_reserve,
@@ -165,7 +182,7 @@ impl InstructionBuilder for RaydiumAmmV4InstructionBuilder {
let user_destination_token_account =
crate::common::fast_fn::get_associated_token_address_with_program_id_fast_use_seed(
&params.payer.pubkey(),
&crate::constants::WSOL_TOKEN_ACCOUNT,
&params.output_mint,
&crate::constants::TOKEN_PROGRAM,
params.open_seed_optimize,
);
@@ -175,7 +192,9 @@ impl InstructionBuilder for RaydiumAmmV4InstructionBuilder {
// ========================================
let mut instructions = Vec::with_capacity(3);
if params.create_output_mint_ata {
if params.create_output_mint_ata
&& params.output_mint == crate::constants::WSOL_TOKEN_ACCOUNT
{
instructions.extend(crate::trading::common::create_wsol_ata(&params.payer.pubkey()));
}
@@ -211,7 +230,9 @@ impl InstructionBuilder for RaydiumAmmV4InstructionBuilder {
accounts.to_vec(),
));
if params.close_output_mint_ata {
if params.close_output_mint_ata
&& params.output_mint == crate::constants::WSOL_TOKEN_ACCOUNT
{
instructions.extend(crate::trading::common::close_wsol(&params.payer.pubkey()));
}
src/instruction/raydium_cpmm.rs
+23 -17
View File
@@ -36,6 +36,13 @@ impl InstructionBuilder for RaydiumCpmmInstructionBuilder {
.downcast_ref::<RaydiumCpmmParams>()
.ok_or_else(|| anyhow!("Invalid protocol params for RaydiumCpmm"))?;
// Whitelist: only allow WSOL/USDC as quote mint
if protocol_params.quote_mint != crate::constants::WSOL_TOKEN_ACCOUNT
&& protocol_params.quote_mint != crate::constants::USDC_TOKEN_ACCOUNT
{
return Err(anyhow!("Unsupported quote mint for Raydium CPMM"));
}
let pool_state = if protocol_params.pool_state == Pubkey::default() {
get_pool_pda(
&protocol_params.amm_config,
@@ -50,7 +57,7 @@ impl InstructionBuilder for RaydiumCpmmInstructionBuilder {
// ========================================
// Trade calculation and account address preparation
// ========================================
let is_base_in = protocol_params.base_mint == crate::constants::WSOL_TOKEN_ACCOUNT;
let is_base_in = protocol_params.base_mint == params.input_mint;
let mint_token_program = if is_base_in {
protocol_params.quote_token_program
} else {
@@ -72,7 +79,7 @@ impl InstructionBuilder for RaydiumCpmmInstructionBuilder {
let wsol_token_account = get_associated_token_address_with_program_id_fast_use_seed(
&params.payer.pubkey(),
&crate::constants::WSOL_TOKEN_ACCOUNT,
&params.input_mint,
&crate::constants::TOKEN_PROGRAM,
params.open_seed_optimize,
);
@@ -83,12 +90,8 @@ impl InstructionBuilder for RaydiumCpmmInstructionBuilder {
params.open_seed_optimize,
);
let wsol_vault_account = get_vault_account(
&pool_state,
&crate::constants::WSOL_TOKEN_ACCOUNT,
protocol_params,
true,
);
let wsol_vault_account =
get_vault_account(&pool_state, &params.input_mint, protocol_params, true);
let mint_vault_account =
get_vault_account(&pool_state, &params.output_mint, protocol_params, false);
@@ -132,7 +135,7 @@ impl InstructionBuilder for RaydiumCpmmInstructionBuilder {
AccountMeta::new(mint_vault_account, false), // Output Vault Account
crate::constants::TOKEN_PROGRAM_META, // Input Token Program (readonly)
AccountMeta::new_readonly(mint_token_program, false), // Output Token Program (readonly)
crate::constants::WSOL_TOKEN_ACCOUNT_META, // Input token mint (readonly)
AccountMeta::new_readonly(params.input_mint, false), // Input token mint (readonly)
AccountMeta::new_readonly(params.output_mint, false), // Output token mint (readonly)
AccountMeta::new(observation_state_account, false), // Observation State Account
];
@@ -166,6 +169,13 @@ impl InstructionBuilder for RaydiumCpmmInstructionBuilder {
.downcast_ref::<RaydiumCpmmParams>()
.ok_or_else(|| anyhow!("Invalid protocol params for RaydiumCpmm"))?;
// Whitelist: only allow WSOL/USDC as quote mint
if protocol_params.quote_mint != crate::constants::WSOL_TOKEN_ACCOUNT
&& protocol_params.quote_mint != crate::constants::USDC_TOKEN_ACCOUNT
{
return Err(anyhow!("Unsupported quote mint for Raydium CPMM"));
}
if params.input_amount.is_none() || params.input_amount.unwrap_or(0) == 0 {
return Err(anyhow!("Token amount is not set"));
}
@@ -207,7 +217,7 @@ impl InstructionBuilder for RaydiumCpmmInstructionBuilder {
let wsol_token_account = get_associated_token_address_with_program_id_fast_use_seed(
&params.payer.pubkey(),
&crate::constants::WSOL_TOKEN_ACCOUNT,
&params.output_mint,
&crate::constants::TOKEN_PROGRAM,
params.open_seed_optimize,
);
@@ -218,12 +228,8 @@ impl InstructionBuilder for RaydiumCpmmInstructionBuilder {
params.open_seed_optimize,
);
let wsol_vault_account = get_vault_account(
&pool_state,
&crate::constants::WSOL_TOKEN_ACCOUNT,
protocol_params,
true,
);
let wsol_vault_account =
get_vault_account(&pool_state, &params.output_mint, protocol_params, true);
let mint_vault_account =
get_vault_account(&pool_state, &params.input_mint, protocol_params, false);
@@ -255,7 +261,7 @@ impl InstructionBuilder for RaydiumCpmmInstructionBuilder {
AccountMeta::new_readonly(mint_token_program, false), // Input Token Program (readonly)
crate::constants::TOKEN_PROGRAM_META, // Output Token Program (readonly)
AccountMeta::new_readonly(params.input_mint, false), // Input token mint (readonly)
crate::constants::WSOL_TOKEN_ACCOUNT_META, // Output token mint (readonly)
AccountMeta::new_readonly(params.output_mint, false), // Output token mint (readonly)
AccountMeta::new(observation_state_account, false), // Observation State Account
];
// Create instruction data
src/lib.rs
+6
View File
@@ -10,6 +10,7 @@ use crate::constants::trade::trade::DEFAULT_SLIPPAGE;
use crate::constants::SOL_TOKEN_ACCOUNT;
use crate::constants::USD1_TOKEN_ACCOUNT;
use crate::constants::WSOL_TOKEN_ACCOUNT;
use crate::constants::USDC_TOKEN_ACCOUNT;
use crate::swqos::SwqosClient;
use crate::swqos::SwqosConfig;
use crate::swqos::TradeType;
@@ -38,6 +39,7 @@ pub enum TradeTokenType {
SOL,
WSOL,
USD1,
USDC,
}
/// Main trading client for Solana DeFi protocols
@@ -276,6 +278,8 @@ impl SolanaTrade {
SOL_TOKEN_ACCOUNT
} else if params.input_token_type == TradeTokenType::WSOL {
WSOL_TOKEN_ACCOUNT
} else if params.input_token_type == TradeTokenType::USDC {
USDC_TOKEN_ACCOUNT
} else {
USD1_TOKEN_ACCOUNT
};
@@ -371,6 +375,8 @@ impl SolanaTrade {
SOL_TOKEN_ACCOUNT
} else if params.output_token_type == TradeTokenType::WSOL {
WSOL_TOKEN_ACCOUNT
} else if params.output_token_type == TradeTokenType::USDC {
USDC_TOKEN_ACCOUNT
} else {
USD1_TOKEN_ACCOUNT
};
src/trading/core/executor.rs
+2 -5
View File
@@ -28,11 +28,8 @@ impl GenericTradeExecutor {
impl TradeExecutor for GenericTradeExecutor {
async fn swap(&self, params: SwapParams) -> Result<(bool, Signature)> {
let start = Instant::now();
// 暂时支持这三种。后续重构扩展builder 支持所有的 swap
let is_buy = params.input_mint == crate::constants::SOL_TOKEN_ACCOUNT
|| params.input_mint == crate::constants::WSOL_TOKEN_ACCOUNT
|| (params.input_mint == crate::constants::USD1_TOKEN_ACCOUNT
&& params.output_mint != crate::constants::WSOL_TOKEN_ACCOUNT);
// Use trade_type directly to determine direction
let is_buy = matches!(params.trade_type, crate::swqos::TradeType::Buy);
// Build instructions directly from params to avoid unnecessary cloning
let instructions = if is_buy {
self.instruction_builder.build_buy_instructions(&params).await?