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

refactor: split seed optimization config into wsol_use_seed and mint_use_seed

Browse Source 
- Split use_seed_optimize parameter into two independent configs:
  * wsol_use_seed: controls seed optimization for WSOL ATA operations (default: false)
  * mint_use_seed: controls seed optimization for other mint ATA operations (default: true)

- Refactor TradeConfig to accept all parameters in new() constructor
- Remove deprecated builder methods (with_seed_config, with_wsol_ata_config)

- Add wsol_use_seed and mint_use_seed fields to SwapParams
- Remove open_seed_optimize field from SwapParams

- Update all instruction builders to use correct seed parameter:
  * Use params.wsol_use_seed for WSOL token operations
  * Use params.mint_use_seed for other token operations
  * Fix token type detection in bonk.rs, raydium_cpmm.rs, and raydium_amm_v4.rs
    to properly select wsol_use_seed when dealing with WSOL tokens

- Update wsol_manager functions to accept is_use_seed parameter:
  * handle_wsol()
  * close_wsol()
  * create_wsol_ata()
  * wrap_sol_only()
  * wrap_wsol_to_sol()

- Add wrap_wsol_to_sol() function with smart temporary account selection:
  * If source is seed-created, use normal ATA for temp account
  * If source is normal ATA, use seed ATA for temp account
  * Prevents address conflicts while optimizing performance

This provides fine-grained control over seed optimization strategies,
allowing different configurations for WSOL and other tokens.
This commit is contained in:
Wood
2025-11-21 13:05:39 +08:00
parent c0e026a88a
commit eb8de36f50
11 changed files with 196 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib.rs
+36 -23
View File
@@ -59,9 +59,10 @@ pub struct SolanaTrade {
pub swqos_clients: Vec<Arc<SwqosClient>>,
/// Optional middleware manager for custom transaction processing
pub middleware_manager: Option<Arc<MiddlewareManager>>,
/// Whether to use seed optimization for all ATA operations (default: true)
/// Applies to all token account creations across buy and sell operations
pub use_seed_optimize: bool,
/// Whether to use seed optimization for WSOL ATA operations (default: false)
pub wsol_use_seed: bool,
/// Whether to use seed optimization for other mint ATA operations (default: true)
pub mint_use_seed: bool,
}
static INSTANCE: Mutex<Option<Arc<SolanaTrade>>> = Mutex::new(None);
@@ -73,7 +74,8 @@ impl Clone for SolanaTrade {
rpc: self.rpc.clone(),
swqos_clients: self.swqos_clients.clone(),
middleware_manager: self.middleware_manager.clone(),
use_seed_optimize: self.use_seed_optimize,
wsol_use_seed: self.wsol_use_seed,
mint_use_seed: self.mint_use_seed,
}
}
}
@@ -223,9 +225,9 @@ impl SolanaTrade {
Err(_) => {
// WSOL ATA不存在，创建它
println!("🔨 创建WSOL ATA: {}", wsol_ata);
// 使用seed优化创建WSOL ATA
// 使用配置中的wsol_use_seed设置创建WSOL ATA
let create_ata_ixs =
crate::trading::common::wsol_manager::create_wsol_ata(&payer.pubkey());
crate::trading::common::wsol_manager::create_wsol_ata(&payer.pubkey(), trade_config.wsol_use_seed);
if !create_ata_ixs.is_empty() {
// 构建并发送交易
@@ -273,7 +275,8 @@ impl SolanaTrade {
rpc,
swqos_clients,
middleware_manager: None,
use_seed_optimize: trade_config.use_seed_optimize,
wsol_use_seed: trade_config.wsol_use_seed,
mint_use_seed: trade_config.mint_use_seed,
};
let mut current = INSTANCE.lock();
@@ -386,7 +389,8 @@ impl SolanaTrade {
.unwrap_or(256 * 1024),
wait_transaction_confirmed: params.wait_transaction_confirmed,
protocol_params: protocol_params.clone(),
open_seed_optimize: self.use_seed_optimize, // 使用全局seed优化配置
wsol_use_seed: self.wsol_use_seed, // 使用wsol_use_seed配置
mint_use_seed: self.mint_use_seed, // 使用mint_use_seed配置
swqos_clients: self.swqos_clients.clone(),
middleware_manager: self.middleware_manager.clone(),
durable_nonce: params.durable_nonce,
@@ -483,7 +487,8 @@ impl SolanaTrade {
wait_transaction_confirmed: params.wait_transaction_confirmed,
protocol_params: protocol_params.clone(),
with_tip: params.with_tip,
open_seed_optimize: self.use_seed_optimize, // 使用全局seed优化配置
wsol_use_seed: self.wsol_use_seed, // 使用wsol_use_seed配置
mint_use_seed: self.mint_use_seed, // 使用mint_use_seed配置
swqos_clients: self.swqos_clients.clone(),
middleware_manager: self.middleware_manager.clone(),
durable_nonce: params.durable_nonce,
@@ -574,6 +579,7 @@ impl SolanaTrade {
///
/// # Arguments
/// * `amount` - The amount of SOL to wrap (in lamports)
/// * `is_use_seed` - Whether to use seed optimization for WSOL ATA creation
///
/// # Returns
/// * `Ok(String)` - Transaction signature if successful
@@ -586,11 +592,11 @@ impl SolanaTrade {
/// - wSOL associated token account creation fails
/// - Transaction fails to execute or confirm
/// - Network or RPC errors occur
pub async fn wrap_sol_to_wsol(&self, amount: u64) -> Result<String, anyhow::Error> {
pub async fn wrap_sol_to_wsol(&self, amount: u64, is_use_seed: bool) -> Result<String, anyhow::Error> {
use crate::trading::common::wsol_manager::handle_wsol;
use solana_sdk::transaction::Transaction;
let recent_blockhash = self.rpc.get_latest_blockhash().await?;
let instructions = handle_wsol(&self.payer.pubkey(), amount);
let instructions = handle_wsol(&self.payer.pubkey(), amount, is_use_seed);
let mut transaction =
Transaction::new_with_payer(&instructions, Some(&self.payer.pubkey()));
transaction.sign(&[&*self.payer], recent_blockhash);
@@ -603,6 +609,9 @@ impl SolanaTrade {
/// transfers any remaining wSOL balance back to the account owner as native SOL.
/// This is useful for cleaning up wSOL accounts and recovering wrapped SOL after trading operations.
///
/// # Arguments
/// * `is_use_seed` - Whether the WSOL ATA was created using seed optimization
///
/// # Returns
/// * `Ok(String)` - Transaction signature if successful
/// * `Err(anyhow::Error)` - If the transaction fails to execute
@@ -614,11 +623,11 @@ impl SolanaTrade {
/// - Account closure fails due to insufficient permissions
/// - Transaction fails to execute or confirm
/// - Network or RPC errors occur
pub async fn close_wsol(&self) -> Result<String, anyhow::Error> {
pub async fn close_wsol(&self, is_use_seed: bool) -> Result<String, anyhow::Error> {
use crate::trading::common::wsol_manager::close_wsol;
use solana_sdk::transaction::Transaction;
let recent_blockhash = self.rpc.get_latest_blockhash().await?;
let instructions = close_wsol(&self.payer.pubkey());
let instructions = close_wsol(&self.payer.pubkey(), is_use_seed);
let mut transaction =
Transaction::new_with_payer(&instructions, Some(&self.payer.pubkey()));
transaction.sign(&[&*self.payer], recent_blockhash);
@@ -632,6 +641,9 @@ impl SolanaTrade {
/// without transferring any SOL into it. This is useful when you want to set up
/// the account infrastructure in advance without committing funds yet.
///
/// # Arguments
/// * `is_use_seed` - Whether to use seed optimization for WSOL ATA creation
///
/// # Returns
/// * `Ok(String)` - Transaction signature if successful
/// * `Err(anyhow::Error)` - If the transaction fails to execute
@@ -643,12 +655,12 @@ impl SolanaTrade {
/// - Transaction fails to execute or confirm
/// - Network or RPC errors occur
/// - Insufficient SOL for transaction fees
pub async fn create_wsol_ata(&self) -> Result<String, anyhow::Error> {
pub async fn create_wsol_ata(&self, is_use_seed: bool) -> Result<String, anyhow::Error> {
use crate::trading::common::wsol_manager::create_wsol_ata;
use solana_sdk::transaction::Transaction;
let recent_blockhash = self.rpc.get_latest_blockhash().await?;
let instructions = create_wsol_ata(&self.payer.pubkey());
let instructions = create_wsol_ata(&self.payer.pubkey(), is_use_seed);
// If instructions are empty, ATA already exists
if instructions.is_empty() {
@@ -664,16 +676,17 @@ impl SolanaTrade {
Ok(signature.to_string())
}
/// 将 WSOL 转换为 SOL，使用 seed 账户
/// 将 WSOL 转换为 SOL，使用临时账户
///
/// 这个函数实现以下步骤：
/// 1. 使用 super::seed::create_associated_token_account_use_seed 创建 WSOL seed 账号
/// 2. 使用 get_associated_token_address_with_program_id_use_seed 获取该账号的 ATA 地址
/// 3. 添加从用户 WSOL ATA 转账到该 seed ATA 账号的指令
/// 4. 添加关闭 WSOL seed 账号的指令
/// 1. 创建临时 WSOL 账号（如果原始账号是seed创建，则临时账号使用普通ATA；否则使用seed）
/// 2. 获取临时账号的 ATA 地址
/// 3. 添加从用户 WSOL ATA 转账到临时 ATA 账号的指令
/// 4. 添加关闭临时 WSOL 账号的指令
///
/// # Arguments
/// * `amount` - 要转换的 WSOL 数量（以 lamports 为单位）
/// * `source_is_seed` - 原始 WSOL 账号是否是 seed 创建的
///
/// # Returns
/// * `Ok(String)` - 交易签名
@@ -683,16 +696,16 @@ impl SolanaTrade {
///
/// 此函数在以下情况下会返回错误：
/// - 用户 WSOL ATA 中余额不足
/// - seed 账户创建失败
/// - 临时账户创建失败
/// - 转账指令执行失败
/// - 交易执行或确认失败
/// - 网络或 RPC 错误
pub async fn wrap_wsol_to_sol(&self, amount: u64) -> Result<String, anyhow::Error> {
pub async fn wrap_wsol_to_sol(&self, amount: u64, source_is_seed: bool) -> Result<String, anyhow::Error> {
use crate::trading::common::wsol_manager::wrap_wsol_to_sol as wrap_wsol_to_sol_internal;
use solana_sdk::transaction::Transaction;
let recent_blockhash = self.rpc.get_latest_blockhash().await?;
let instructions = wrap_wsol_to_sol_internal(&self.payer.pubkey(), amount)?;
let instructions = wrap_wsol_to_sol_internal(&self.payer.pubkey(), amount, source_is_seed)?;
let mut transaction = Transaction::new_with_payer(&instructions, Some(&self.payer.pubkey()));
transaction.sign(&[&*self.payer], recent_blockhash);