refactor: Major SDK architecture refactoring and API consolidation
- Consolidate separate buy/sell modules into unified trading interface - Remove protocol-specific buy/sell files (bonk, pumpfun, pumpswap) - Add new trading constants and utility functions - Simplify API with unified buy/sell methods supporting multiple protocols - Enhance documentation with comprehensive examples and usage guides - Add balance checking and token account management utilities - Improve code organization and maintainability
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
use anyhow::{anyhow, Result};
|
||||
use solana_sdk::signer::Signer;
|
||||
use std::sync::Arc;
|
||||
|
||||
use super::{
|
||||
@@ -13,6 +12,8 @@ use crate::{
|
||||
trading::common::{build_rpc_transaction, build_sell_transaction},
|
||||
};
|
||||
|
||||
const MAX_LOADED_ACCOUNTS_DATA_SIZE_LIMIT: u32 = 256 * 1024;
|
||||
|
||||
/// 通用交易执行器实现
|
||||
pub struct GenericTradeExecutor {
|
||||
instruction_builder: Arc<dyn InstructionBuilder>,
|
||||
@@ -29,26 +30,14 @@ impl GenericTradeExecutor {
|
||||
protocol_name,
|
||||
}
|
||||
}
|
||||
|
||||
/// 获取代币余额
|
||||
async fn get_token_balance(
|
||||
&self,
|
||||
rpc: Arc<crate::common::SolanaRpcClient>,
|
||||
payer: &solana_sdk::signature::Keypair,
|
||||
mint: &solana_sdk::pubkey::Pubkey,
|
||||
) -> Result<u64> {
|
||||
let ata = spl_associated_token_account::get_associated_token_address(&payer.pubkey(), mint);
|
||||
let balance = rpc.get_token_account_balance(&ata).await?;
|
||||
balance
|
||||
.amount
|
||||
.parse::<u64>()
|
||||
.map_err(|_| anyhow!("Failed to parse token balance"))
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait::async_trait]
|
||||
impl TradeExecutor for GenericTradeExecutor {
|
||||
async fn buy(&self, params: BuyParams) -> Result<()> {
|
||||
async fn buy(&self, mut params: BuyParams) -> Result<()> {
|
||||
if params.data_size_limit == 0 {
|
||||
params.data_size_limit = MAX_LOADED_ACCOUNTS_DATA_SIZE_LIMIT;
|
||||
}
|
||||
if params.rpc.is_none() {
|
||||
return Err(anyhow!("RPC is not set"));
|
||||
}
|
||||
@@ -80,7 +69,10 @@ impl TradeExecutor for GenericTradeExecutor {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn buy_with_tip(&self, params: BuyWithTipParams) -> Result<()> {
|
||||
async fn buy_with_tip(&self, mut params: BuyWithTipParams) -> Result<()> {
|
||||
if params.data_size_limit == 0 {
|
||||
params.data_size_limit = MAX_LOADED_ACCOUNTS_DATA_SIZE_LIMIT;
|
||||
}
|
||||
let mut timer = TradeTimer::new("构建买入交易指令");
|
||||
|
||||
// 验证参数 - 转换为BuyParams进行验证
|
||||
|
||||
+28
-17
@@ -3,9 +3,9 @@ use solana_sdk::{pubkey::Pubkey, signature::Keypair};
|
||||
use std::sync::Arc;
|
||||
|
||||
use super::traits::ProtocolParams;
|
||||
use crate::common::bonding_curve::BondingCurveAccount;
|
||||
use crate::common::{PriorityFee, SolanaRpcClient};
|
||||
use crate::swqos::SwqosClient;
|
||||
use crate::common::bonding_curve::BondingCurveAccount;
|
||||
|
||||
/// 通用买入参数
|
||||
#[derive(Clone)]
|
||||
@@ -74,24 +74,18 @@ pub struct SellWithTipParams {
|
||||
/// PumpFun协议特定参数
|
||||
#[derive(Clone)]
|
||||
pub struct PumpFunParams {
|
||||
pub trade_type: String,
|
||||
pub bonding_curve: Option<Arc<BondingCurveAccount>>,
|
||||
}
|
||||
|
||||
impl ProtocolParams for PumpFunParams {
|
||||
fn as_any(&self) -> &dyn std::any::Any {
|
||||
self
|
||||
}
|
||||
|
||||
fn clone_box(&self) -> Box<dyn ProtocolParams> {
|
||||
Box::new(self.clone())
|
||||
impl PumpFunParams {
|
||||
pub fn default() -> Self {
|
||||
Self {
|
||||
bonding_curve: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct PumpFunSellParams {}
|
||||
|
||||
impl ProtocolParams for PumpFunSellParams {
|
||||
impl ProtocolParams for PumpFunParams {
|
||||
fn as_any(&self) -> &dyn std::any::Any {
|
||||
self
|
||||
}
|
||||
@@ -105,13 +99,18 @@ impl ProtocolParams for PumpFunSellParams {
|
||||
#[derive(Clone)]
|
||||
pub struct PumpSwapParams {
|
||||
pub pool: Option<Pubkey>,
|
||||
pub pool_base_token_account: Option<Pubkey>,
|
||||
pub pool_quote_token_account: Option<Pubkey>,
|
||||
pub user_base_token_account: Option<Pubkey>,
|
||||
pub user_quote_token_account: Option<Pubkey>,
|
||||
pub auto_handle_wsol: bool,
|
||||
}
|
||||
|
||||
impl PumpSwapParams {
|
||||
pub fn default() -> Self {
|
||||
Self {
|
||||
pool: None,
|
||||
auto_handle_wsol: true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl ProtocolParams for PumpSwapParams {
|
||||
fn as_any(&self) -> &dyn std::any::Any {
|
||||
self
|
||||
@@ -132,6 +131,18 @@ pub struct BonkParams {
|
||||
pub auto_handle_wsol: bool,
|
||||
}
|
||||
|
||||
impl BonkParams {
|
||||
pub fn default() -> Self {
|
||||
Self {
|
||||
virtual_base: None,
|
||||
virtual_quote: None,
|
||||
real_base_before: None,
|
||||
real_quote_before: None,
|
||||
auto_handle_wsol: true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl ProtocolParams for BonkParams {
|
||||
fn as_any(&self) -> &dyn std::any::Any {
|
||||
self
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
use anyhow::Result;
|
||||
use solana_sdk::instruction::Instruction;
|
||||
use std::sync::Arc;
|
||||
|
||||
use super::params::{BuyParams, BuyWithTipParams, SellParams, SellWithTipParams};
|
||||
|
||||
/// 交易执行器trait - 定义了所有交易协议都需要实现的核心方法
|
||||
|
||||
Reference in New Issue
Block a user