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

Revert "feat: swap support usdc quote"

Browse Source 
This reverts commit 9bb08bd567.
This commit is contained in:
tommggo
2025-10-08 21:04:50 +08:00
parent 9bb08bd567
commit d567477bdb
10 changed files with 94 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/pumpswap_trading/src/main.rs
+21 -25
View File
@@ -83,13 +83,10 @@ fn create_event_callback() -> impl Fn(Box<dyn UnifiedEvent>) {
|event: Box<dyn UnifiedEvent>| {
match_event!(event, {
PumpSwapBuyEvent => |e: PumpSwapBuyEvent| {
if e.quote_mint == sol_trade_sdk::constants::WSOL_TOKEN_ACCOUNT
|| e.quote_mint == sol_trade_sdk::constants::USDC_TOKEN_ACCOUNT
{
if e.base_mint == sol_trade_sdk::constants::WSOL_TOKEN_ACCOUNT || e.quote_mint == sol_trade_sdk::constants::WSOL_TOKEN_ACCOUNT {
// Test code, only test one transaction
if !ALREADY_EXECUTED.swap(true, Ordering::SeqCst) {
let event_clone = e.clone();
println!("PumpSwapBuyEvent: {:?}", event_clone);
tokio::spawn(async move {
if let Err(err) = pumpswap_trade_with_grpc_buy_event(event_clone).await {
eprintln!("Error in trade: {:?}", err);
@@ -100,13 +97,10 @@ fn create_event_callback() -> impl Fn(Box<dyn UnifiedEvent>) {
}
},
PumpSwapSellEvent => |e: PumpSwapSellEvent| {
if e.quote_mint == sol_trade_sdk::constants::WSOL_TOKEN_ACCOUNT
|| e.quote_mint == sol_trade_sdk::constants::USDC_TOKEN_ACCOUNT
{
if e.base_mint == sol_trade_sdk::constants::WSOL_TOKEN_ACCOUNT || e.quote_mint == sol_trade_sdk::constants::WSOL_TOKEN_ACCOUNT {
// Test code, only test one transaction
if !ALREADY_EXECUTED.swap(true, Ordering::SeqCst) {
let event_clone = e.clone();
println!("PumpSwapSellEvent: {:?}", event_clone);
tokio::spawn(async move {
if let Err(err) = pumpswap_trade_with_grpc_sell_event(event_clone).await {
eprintln!("Error in trade: {:?}", err);
@@ -124,7 +118,7 @@ fn create_event_callback() -> impl Fn(Box<dyn UnifiedEvent>) {
/// Initializes a new SolanaTrade client with configuration
async fn create_solana_trade_client() -> AnyResult<SolanaTrade> {
println!("🚀 Initializing SolanaTrade client...");
let payer = Keypair::from_base58_string("5tnuyXTkvUmpHptH7ib8uTEfszdmAY1sqaxeMrQeMZiwFJHnmCig6yFcjtEp9dFHqhoXBCqhQusgxHapbZ5M4hV5");
let payer = Keypair::from_base58_string("use_your_payer_keypair_here");
let rpc_url = "https://api.mainnet-beta.solana.com".to_string();
let commitment = CommitmentConfig::confirmed();
let swqos_configs: Vec<SwqosConfig> = vec![SwqosConfig::Default(rpc_url.clone())];
@@ -150,9 +144,11 @@ async fn pumpswap_trade_with_grpc_buy_event(trade_info: PumpSwapBuyEvent) -> Any
trade_info.base_token_program,
trade_info.quote_token_program,
);
// Target the base token; quote is WSOL/USDC per filter
let mint = trade_info.base_mint;
println!("mint: {:?}", mint);
let mint = if trade_info.base_mint == sol_trade_sdk::constants::WSOL_TOKEN_ACCOUNT {
trade_info.quote_mint
} else {
trade_info.base_mint
};
pumpswap_trade_with_grpc(mint, params).await?;
Ok(())
}
@@ -171,9 +167,11 @@ async fn pumpswap_trade_with_grpc_sell_event(trade_info: PumpSwapSellEvent) -> A
trade_info.base_token_program,
trade_info.quote_token_program,
);
// Target the base token; quote is WSOL/USDC per filter
let mint = trade_info.base_mint;
println!("mint: {:?}", mint);
let mint = if trade_info.base_mint == sol_trade_sdk::constants::WSOL_TOKEN_ACCOUNT {
trade_info.quote_mint
} else {
trade_info.base_mint
};
pumpswap_trade_with_grpc(mint, params).await?;
Ok(())
}
@@ -184,24 +182,22 @@ async fn pumpswap_trade_with_grpc(mint_pubkey: Pubkey, params: PumpSwapParams) -
let client = create_solana_trade_client().await?;
let slippage_basis_points = Some(500);
let recent_blockhash = client.rpc.get_latest_blockhash().await?;
let is_usdc_quote = params.quote_mint == sol_trade_sdk::constants::USDC_TOKEN_ACCOUNT;
// Buy tokens
println!("Buying tokens from PumpSwap...");
// Use 0.0001 SOL (100_000 lamports) for WSOL quote, or 0.3 USDC (300_000 base units) for USDC quote
let buy_input_amount: u64 = if is_usdc_quote { 300_000 } else { 100_000 };
let buy_sol_amount = 100_000;
let buy_params = sol_trade_sdk::TradeBuyParams {
dex_type: DexType::PumpSwap,
input_token_type: if is_usdc_quote { TradeTokenType::USDC } else { TradeTokenType::SOL },
input_token_type: TradeTokenType::SOL,
mint: mint_pubkey,
input_token_amount: buy_input_amount,
input_token_amount: buy_sol_amount,
slippage_basis_points: slippage_basis_points,
recent_blockhash: Some(recent_blockhash),
extension_params: Box::new(params.clone()),
lookup_table_key: None,
wait_transaction_confirmed: true,
create_input_token_ata: !is_usdc_quote,
close_input_token_ata: !is_usdc_quote,
create_input_token_ata: true,
close_input_token_ata: true,
create_mint_ata: true,
open_seed_optimize: false,
durable_nonce: None,
@@ -224,7 +220,7 @@ async fn pumpswap_trade_with_grpc(mint_pubkey: Pubkey, params: PumpSwapParams) -
let amount_token = balance.amount.parse::<u64>().unwrap();
let sell_params = sol_trade_sdk::TradeSellParams {
dex_type: DexType::PumpSwap,
output_token_type: if is_usdc_quote { TradeTokenType::USDC } else { TradeTokenType::SOL },
output_token_type: TradeTokenType::SOL,
mint: mint_pubkey,
input_token_amount: amount_token,
slippage_basis_points: slippage_basis_points,
@@ -233,8 +229,8 @@ async fn pumpswap_trade_with_grpc(mint_pubkey: Pubkey, params: PumpSwapParams) -
extension_params: Box::new(params.clone()),
lookup_table_key: None,
wait_transaction_confirmed: true,
create_output_token_ata: !is_usdc_quote,
close_output_token_ata: !is_usdc_quote,
create_output_token_ata: true,
close_output_token_ata: true,
open_seed_optimize: false,
durable_nonce: None,
fixed_output_token_amount: None,
examples/raydium_amm_v4_trading/src/main.rs
+10 -19
View File
@@ -101,7 +101,7 @@ fn create_event_callback() -> impl Fn(Box<dyn UnifiedEvent>) {
/// Initializes a new SolanaTrade client with configuration
async fn create_solana_trade_client() -> AnyResult<SolanaTrade> {
println!("🚀 Initializing SolanaTrade client...");
let payer = Keypair::from_base58_string("5tnuyXTkvUmpHptH7ib8uTEfszdmAY1sqaxeMrQeMZiwFJHnmCig6yFcjtEp9dFHqhoXBCqhQusgxHapbZ5M4hV5");
let payer = Keypair::from_base58_string("use_your_payer_keypair_here");
let rpc_url = "https://api.mainnet-beta.solana.com".to_string();
let commitment = CommitmentConfig::confirmed();
let swqos_configs: Vec<SwqosConfig> = vec![SwqosConfig::Default(rpc_url.clone())];
@@ -125,15 +125,7 @@ async fn raydium_amm_v4_copy_trade_with_grpc(trade_info: RaydiumAmmV4SwapEvent)
let amm_info = fetch_amm_info(&client.rpc, trade_info.amm).await?;
let (coin_reserve, pc_reserve) =
get_multi_token_balances(&client.rpc, &amm_info.token_coin, &amm_info.token_pc).await?;
// Only handle WSOL/USDC quote pools to align with SDK whitelist
let is_usdc_quote = amm_info.pc_mint == sol_trade_sdk::constants::USDC_TOKEN_ACCOUNT;
let is_wsol_quote = amm_info.pc_mint == sol_trade_sdk::constants::WSOL_TOKEN_ACCOUNT;
if !is_usdc_quote && !is_wsol_quote {
return Ok(());
}
let mint_pubkey = if amm_info.pc_mint == sol_trade_sdk::constants::WSOL_TOKEN_ACCOUNT
|| amm_info.pc_mint == sol_trade_sdk::constants::USDC_TOKEN_ACCOUNT
{
let mint_pubkey = if amm_info.pc_mint == sol_trade_sdk::constants::WSOL_TOKEN_ACCOUNT {
amm_info.coin_mint
} else {
amm_info.pc_mint
@@ -149,20 +141,19 @@ async fn raydium_amm_v4_copy_trade_with_grpc(trade_info: RaydiumAmmV4SwapEvent)
);
// Buy tokens
println!("Buying tokens from Raydium_amm_v4...");
// Use 0.0001 SOL (100_000 lamports) for WSOL quote, or 0.3 USDC (300_000 base units) for USDC quote
let buy_input_amount: u64 = if is_usdc_quote { 300_000 } else { 100_000 };
let buy_sol_amount = 100_000;
let buy_params = sol_trade_sdk::TradeBuyParams {
dex_type: DexType::RaydiumAmmV4,
input_token_type: if is_usdc_quote { TradeTokenType::USDC } else { TradeTokenType::SOL },
input_token_type: TradeTokenType::WSOL,
mint: mint_pubkey,
input_token_amount: buy_input_amount,
input_token_amount: buy_sol_amount,
slippage_basis_points: slippage_basis_points,
recent_blockhash: Some(recent_blockhash),
extension_params: Box::new(params),
lookup_table_key: None,
wait_transaction_confirmed: true,
create_input_token_ata: !is_usdc_quote,
close_input_token_ata: !is_usdc_quote,
create_input_token_ata: true,
close_input_token_ata: true,
create_mint_ata: true,
open_seed_optimize: false,
durable_nonce: None,
@@ -184,7 +175,7 @@ async fn raydium_amm_v4_copy_trade_with_grpc(trade_info: RaydiumAmmV4SwapEvent)
let params = RaydiumAmmV4Params::from_amm_address_by_rpc(&client.rpc, trade_info.amm).await?;
let sell_params = sol_trade_sdk::TradeSellParams {
dex_type: DexType::RaydiumAmmV4,
output_token_type: if is_usdc_quote { TradeTokenType::USDC } else { TradeTokenType::SOL },
output_token_type: TradeTokenType::WSOL,
mint: mint_pubkey,
input_token_amount: amount_token,
slippage_basis_points: slippage_basis_points,
@@ -193,8 +184,8 @@ async fn raydium_amm_v4_copy_trade_with_grpc(trade_info: RaydiumAmmV4SwapEvent)
extension_params: Box::new(params),
lookup_table_key: None,
wait_transaction_confirmed: true,
create_output_token_ata: !is_usdc_quote,
close_output_token_ata: !is_usdc_quote,
create_output_token_ata: true,
close_output_token_ata: true,
open_seed_optimize: false,
durable_nonce: None,
fixed_output_token_amount: None,
examples/raydium_cpmm_trading/src/main.rs
+21 -26
View File
@@ -1,6 +1,6 @@
use sol_trade_sdk::common::spl_associated_token_account::get_associated_token_address;
use sol_trade_sdk::common::TradeConfig;
use sol_trade_sdk::constants::{USDC_TOKEN_ACCOUNT, WSOL_TOKEN_ACCOUNT};
use sol_trade_sdk::constants::WSOL_TOKEN_ACCOUNT;
use sol_trade_sdk::trading::core::params::RaydiumCpmmParams;
use sol_trade_sdk::trading::factory::DexType;
use sol_trade_sdk::TradeTokenType;
@@ -79,11 +79,7 @@ fn create_event_callback() -> impl Fn(Box<dyn UnifiedEvent>) {
|event: Box<dyn UnifiedEvent>| {
match_event!(event, {
RaydiumCpmmSwapEvent => |e: RaydiumCpmmSwapEvent| {
if e.input_token_mint != WSOL_TOKEN_ACCOUNT
&& e.output_token_mint != WSOL_TOKEN_ACCOUNT
&& e.input_token_mint != USDC_TOKEN_ACCOUNT
&& e.output_token_mint != USDC_TOKEN_ACCOUNT
{
if e.input_token_mint != WSOL_TOKEN_ACCOUNT && e.output_token_mint != WSOL_TOKEN_ACCOUNT {
return;
}
// Test code, only test one transaction
@@ -105,7 +101,7 @@ fn create_event_callback() -> impl Fn(Box<dyn UnifiedEvent>) {
/// Initializes a new SolanaTrade client with configuration
async fn create_solana_trade_client() -> AnyResult<SolanaTrade> {
println!("🚀 Initializing SolanaTrade client...");
let payer = Keypair::from_base58_string("5tnuyXTkvUmpHptH7ib8uTEfszdmAY1sqaxeMrQeMZiwFJHnmCig6yFcjtEp9dFHqhoXBCqhQusgxHapbZ5M4hV5");
let payer = Keypair::from_base58_string("use_your_payer_keypair_here");
let rpc_url = "https://api.mainnet-beta.solana.com".to_string();
let commitment = CommitmentConfig::confirmed();
let swqos_configs: Vec<SwqosConfig> = vec![SwqosConfig::Default(rpc_url.clone())];
@@ -123,34 +119,32 @@ async fn raydium_cpmm_copy_trade_with_grpc(trade_info: RaydiumCpmmSwapEvent) ->
println!("Testing Raydium_cpmm trading...");
let client = create_solana_trade_client().await?;
// Determine tradable mint: always the non-quote side; only handle WSOL/USDC quote pools
let pool_info = RaydiumCpmmParams::from_pool_address_by_rpc(&client.rpc, &trade_info.pool_state).await?;
let is_usdc_quote = pool_info.quote_mint == sol_trade_sdk::constants::USDC_TOKEN_ACCOUNT;
let is_wsol_quote = pool_info.quote_mint == sol_trade_sdk::constants::WSOL_TOKEN_ACCOUNT;
if !is_usdc_quote && !is_wsol_quote {
return Ok(());
}
let mint_pubkey = pool_info.base_mint;
let mint_pubkey = if trade_info.input_token_mint == sol_trade_sdk::constants::WSOL_TOKEN_ACCOUNT
{
trade_info.output_token_mint
} else {
trade_info.input_token_mint
};
let slippage_basis_points = Some(100);
let recent_blockhash = client.rpc.get_latest_blockhash().await?;
let buy_params = pool_info.clone();
let buy_params =
RaydiumCpmmParams::from_pool_address_by_rpc(&client.rpc, &trade_info.pool_state).await?;
// Buy tokens
println!("Buying tokens from Raydium_cpmm...");
// Use 0.0001 SOL (100_000 lamports) for WSOL quote, or 0.3 USDC (300_000 base units) for USDC quote
let buy_input_amount: u64 = if is_usdc_quote { 300_000 } else { 100_000 };
let buy_sol_amount = 100_000;
let buy_params = sol_trade_sdk::TradeBuyParams {
dex_type: DexType::RaydiumCpmm,
input_token_type: if is_usdc_quote { TradeTokenType::USDC } else { TradeTokenType::SOL },
input_token_type: TradeTokenType::WSOL,
mint: mint_pubkey,
input_token_amount: buy_input_amount,
input_token_amount: buy_sol_amount,
slippage_basis_points: slippage_basis_points,
recent_blockhash: Some(recent_blockhash),
extension_params: Box::new(buy_params),
lookup_table_key: None,
wait_transaction_confirmed: true,
create_input_token_ata: !is_usdc_quote,
close_input_token_ata: !is_usdc_quote,
create_input_token_ata: true,
close_input_token_ata: true,
create_mint_ata: true,
open_seed_optimize: false,
durable_nonce: None,
@@ -168,12 +162,13 @@ async fn raydium_cpmm_copy_trade_with_grpc(trade_info: RaydiumCpmmSwapEvent) ->
println!("Balance: {:?}", balance);
let amount_token = balance.amount.parse::<u64>().unwrap();
let sell_params = pool_info;
let sell_params =
RaydiumCpmmParams::from_pool_address_by_rpc(&client.rpc, &trade_info.pool_state).await?;
println!("Selling {} tokens", amount_token);
let sell_params = sol_trade_sdk::TradeSellParams {
dex_type: DexType::RaydiumCpmm,
output_token_type: if is_usdc_quote { TradeTokenType::USDC } else { TradeTokenType::SOL },
output_token_type: TradeTokenType::WSOL,
mint: mint_pubkey,
input_token_amount: amount_token,
slippage_basis_points: slippage_basis_points,
@@ -182,8 +177,8 @@ async fn raydium_cpmm_copy_trade_with_grpc(trade_info: RaydiumCpmmSwapEvent) ->
extension_params: Box::new(sell_params),
lookup_table_key: None,
wait_transaction_confirmed: true,
create_output_token_ata: !is_usdc_quote,
close_output_token_ata: !is_usdc_quote,
create_output_token_ata: true,
close_output_token_ata: true,
open_seed_optimize: false,
durable_nonce: None,
fixed_output_token_amount: None,