fix warnings

This commit is contained in:
William
2025-01-08 16:33:43 +08:00
parent 7882db4b12
commit 7d2365cd84
7 changed files with 174 additions and 444 deletions
+3
View File
@@ -48,6 +48,8 @@ pub enum ClientError {
/// Rate limit exceeded
RateLimitExceeded,
OrderLimitExceeded,
ExternalService(String),
Redis(String, String),
@@ -95,6 +97,7 @@ impl std::fmt::Display for ClientError {
Self::SimulationError(msg) => write!(f, "Transaction simulation failed: {}", msg),
Self::ExternalService(msg) => write!(f, "External service error: {}", msg),
Self::RateLimitExceeded => write!(f, "Rate limit exceeded"),
Self::OrderLimitExceeded => write!(f, "Order limit exceeded"),
Self::Solana(msg, details) => write!(f, "Solana error: {}, details: {}", msg, details),
Self::Parse(msg, details) => write!(f, "Parse error: {}, details: {}", msg, details),
Self::Jito(msg, details) => write!(f, "Jito error: {}, details: {}", msg, details),
@@ -1,7 +1,6 @@
use crate::instruction::logs_data::{CreateTokenInfo, TradeInfo};
use crate::instruction::logs_data::DexInstruction;
use crate::instruction::logs_parser::{parse_create_token_data, parse_trade_data};
use crate::error::ClientResult;
use crate::instruction::logs_data::DexInstruction;
use anchor_client::solana_sdk::pubkey::Pubkey;
pub struct LogFilter;
@@ -1,5 +1,3 @@
use futures::{future::BoxFuture, Future, StreamExt};
use serde::{Serialize, Deserialize};
use base64::{Engine as _, engine::general_purpose::STANDARD as BASE64};
use crate::error::{ClientError, ClientResult};
@@ -99,6 +99,5 @@ where
}
pub async fn stop_subscription(handle: SubscriptionHandle) {
(handle.unsub_fn)();
handle.task.abort();
handle.shutdown().await;
}
+3 -8
View File
@@ -7,13 +7,11 @@ use anchor_client::solana_sdk::{
commitment_config::CommitmentConfig, pubkey::Pubkey, signature::Signature, transaction::Transaction
};
use crate::error::ClientError::{self, *};
use crate::error::ClientError;
/// 常量定义
pub const MAX_RETRIES: u8 = 3;
pub const RETRY_DELAY: Duration = Duration::from_millis(200);
/// 交易配置
#[derive(Debug, Clone)]
pub struct TransactionConfig {
pub skip_preflight: bool,
@@ -25,13 +23,14 @@ pub struct TransactionConfig {
impl Default for TransactionConfig {
fn default() -> Self {
Self {
skip_preflight: true, // Jito 建议跳过预检
skip_preflight: true,
preflight_commitment: CommitmentConfig::confirmed(),
encoding: "base58".to_string(),
last_n_blocks: 100,
}
}
}
#[derive(Clone)]
pub struct JitoClient {
endpoint: String,
@@ -48,7 +47,6 @@ impl JitoClient {
}
}
/// 获取随机的 tip account
pub async fn get_tip_account(&self) -> Result<Pubkey, ClientError> {
let response = self.send_request("getTipAccounts", json!([])).await?;
@@ -74,7 +72,6 @@ impl JitoClient {
Err(ClientError::Other("Failed to get Tip Account".to_string()))
}
/// 估算优先费用
pub async fn estimate_priority_fees(
&self,
account: &Pubkey,
@@ -87,7 +84,6 @@ impl JitoClient {
let response = self.send_request("qn_estimatePriorityFees", params).await?;
// 解析响应
if let Some(result) = response.get("result") {
let estimate: PriorityFeeEstimate = serde_json::from_value(result.clone())
.map_err(|e| ClientError::Parse(
@@ -104,7 +100,6 @@ impl JitoClient {
}
}
/// 发送交易
pub async fn send_transaction(
&self,
transaction: &Transaction,
+166 -427
View File
@@ -37,46 +37,29 @@ pub use pumpfun_cpi as cpi;
use crate::jito::JitoClient;
use crate::error::ClientError;
// 常量定义
const DEFAULT_SLIPPAGE: u64 = 500; // 10%
const DEFAULT_COMPUTE_UNIT_LIMIT: u32 = 68_000;
const DEFAULT_COMPUTE_UNIT_PRICE: u64 = 400_000;
/// Configuration for priority fee compute unit parameters
/// 优先费用配置
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub struct PriorityFee {
/// Maximum compute units that can be consumed by the transaction
pub limit: Option<u32>,
/// Price in micro-lamports per compute unit
pub price: Option<u64>,
}
/// Main client for interacting with the Pump.fun program
/// PumpFun 客户端
pub struct PumpFun {
/// RPC client for Solana network requests
pub rpc: RpcClient,
/// Keypair used to sign transactions
pub payer: Arc<Keypair>,
/// Anchor client instance
pub client: Client<Arc<Keypair>>,
/// Jito client instance
pub jito_client: Option<JitoClient>,
/// Anchor program instance
pub jito_client: Option<JitoClient>,
pub program: Program<Arc<Keypair>>,
}
impl PumpFun {
/// Creates a new PumpFun client instance
///
/// # Arguments
///
/// * `cluster` - Solana cluster to connect to (e.g. devnet, mainnet-beta)
/// * `payer` - Keypair used to sign and pay for transactions
/// * `options` - Optional commitment config for transaction finality
/// * `ws` - Whether to use websocket connection instead of HTTP
///
/// # Returns
///
/// Returns a new PumpFun client instance configured with the provided parameters
// 创建新实例
pub fn new(
cluster: Cluster,
jito_url: Option<String>,
@@ -84,29 +67,22 @@ impl PumpFun {
options: Option<CommitmentConfig>,
ws: Option<bool>,
) -> Self {
// Create Solana RPC Client with either WS or HTTP endpoint
let rpc: RpcClient = RpcClient::new(if ws.unwrap_or(false) {
let rpc = RpcClient::new(if ws.unwrap_or(false) {
cluster.ws_url()
} else {
cluster.url()
});
let mut jito_client = None;
if let Some(jito_url) = jito_url {
jito_client = Some(JitoClient::new(&jito_url));
}
let jito_client = jito_url.map(|url| JitoClient::new(&url));
// Create Anchor Client with optional commitment config
let client: Client<Arc<Keypair>> = if let Some(options) = options {
let client = if let Some(options) = options {
Client::new_with_options(cluster.clone(), payer.clone(), options)
} else {
Client::new(cluster.clone(), payer.clone())
};
// Create Anchor Program instance for Pump.fun
let program: Program<Arc<Keypair>> = client.program(cpi::ID).unwrap();
let program = client.program(cpi::ID).unwrap();
// Return configured PumpFun client
Self {
rpc,
payer,
@@ -116,44 +92,20 @@ impl PumpFun {
}
}
/// Creates a new token with metadata by uploading metadata to IPFS and initializing on-chain accounts
///
/// # Arguments
///
/// * `mint` - Keypair for the new token mint account that will be created
/// * `metadata` - Token metadata including name, symbol, description and image file
/// * `priority_fee` - Optional priority fee configuration for compute units
///
/// # Returns
///
/// Returns the transaction signature if successful, or a ClientError if the operation fails
// 创建代币
pub async fn create(
&self,
mint: &Keypair,
metadata: utils::CreateTokenMetadata,
priority_fee: Option<PriorityFee>,
) -> Result<Signature, error::ClientError> {
// First upload metadata and image to IPFS
let ipfs: utils::TokenMetadataResponse = utils::create_token_metadata(metadata)
let ipfs = utils::create_token_metadata(metadata)
.await
.map_err(error::ClientError::UploadMetadataError)?;
let mut request = self.program.request();
request = self.add_priority_fee(request, priority_fee);
// Add priority fee if provided
if let Some(fee) = priority_fee {
if let Some(limit) = fee.limit {
let limit_ix = ComputeBudgetInstruction::set_compute_unit_limit(limit);
request = request.instruction(limit_ix);
}
if let Some(price) = fee.price {
let price_ix = ComputeBudgetInstruction::set_compute_unit_price(price);
request = request.instruction(price_ix);
}
}
// Add create token instruction
request = request.instruction(instruction::create(
&self.payer.clone().as_ref(),
mint,
@@ -164,11 +116,9 @@ impl PumpFun {
},
));
// Add signers
request = request.signer(&self.payer).signer(mint);
// Send transaction
let signature: Signature = request
let signature = request
.send()
.await
.map_err(error::ClientError::AnchorClientError)?;
@@ -176,19 +126,7 @@ impl PumpFun {
Ok(signature)
}
/// Creates a new token and immediately buys an initial amount in a single atomic transaction
///
/// # Arguments
///
/// * `mint` - Keypair for the new token mint
/// * `metadata` - Token metadata to upload to IPFS
/// * `amount_sol` - Amount of SOL to spend on initial buy in lamports
/// * `slippage_basis_points` - Optional maximum acceptable slippage in basis points (1 bp = 0.01%). Defaults to 500
/// * `priority_fee` - Optional priority fee configuration for compute units
///
/// # Returns
///
/// Returns the transaction signature if successful, or a ClientError if the operation fails
// 创建并购买代币
pub async fn create_and_buy(
&self,
mint: &Keypair,
@@ -197,33 +135,19 @@ impl PumpFun {
slippage_basis_points: Option<u64>,
priority_fee: Option<PriorityFee>,
) -> Result<Signature, error::ClientError> {
// Upload metadata to IPFS first
let ipfs: utils::TokenMetadataResponse = utils::create_token_metadata(metadata)
let ipfs = utils::create_token_metadata(metadata)
.await
.map_err(error::ClientError::UploadMetadataError)?;
// Get accounts and calculate buy amounts
let global_account = self.get_global_account()?;
let buy_amount = global_account.get_initial_buy_price(amount_sol);
let buy_amount_with_slippage =
utils::calculate_with_slippage_buy(amount_sol, slippage_basis_points.unwrap_or(500));
utils::calculate_with_slippage_buy(amount_sol, slippage_basis_points.unwrap_or(DEFAULT_SLIPPAGE));
let mut request = self.program.request();
// Add priority fee if provided
if let Some(fee) = priority_fee {
if let Some(limit) = fee.limit {
let limit_ix = ComputeBudgetInstruction::set_compute_unit_limit(limit);
request = request.instruction(limit_ix);
}
request = self.add_priority_fee(request, priority_fee);
if let Some(price) = fee.price {
let price_ix = ComputeBudgetInstruction::set_compute_unit_price(price);
request = request.instruction(price_ix);
}
}
// Add create token instruction
request = request.instruction(instruction::create(
&self.payer.clone().as_ref(),
mint,
@@ -234,8 +158,7 @@ impl PumpFun {
},
));
// Create Associated Token Account if needed
let ata: Pubkey = get_associated_token_address(&self.payer.pubkey(), &mint.pubkey());
let ata = get_associated_token_address(&self.payer.pubkey(), &mint.pubkey());
if self.rpc.get_account(&ata).is_err() {
request = request.instruction(create_associated_token_account(
&self.payer.pubkey(),
@@ -245,7 +168,6 @@ impl PumpFun {
));
}
// Add buy instruction
request = request.instruction(instruction::buy(
&self.payer.clone().as_ref(),
&mint.pubkey(),
@@ -256,8 +178,7 @@ impl PumpFun {
},
));
// Add signers and send transaction
let signature: Signature = request
let signature = request
.signer(&self.payer)
.signer(mint)
.send()
@@ -267,18 +188,7 @@ impl PumpFun {
Ok(signature)
}
/// Buys tokens from a bonding curve by spending SOL
///
/// # Arguments
///
/// * `mint` - Public key of the token mint to buy
/// * `amount_sol` - Amount of SOL to spend in lamports
/// * `slippage_basis_points` - Optional maximum acceptable slippage in basis points (1 bp = 0.01%). Defaults to 500
/// * `priority_fee` - Optional priority fee configuration for compute units
///
/// # Returns
///
/// Returns the transaction signature if successful, or a ClientError if the operation fails
// 购买代币
pub async fn buy(
&self,
mint: &Pubkey,
@@ -286,32 +196,19 @@ impl PumpFun {
slippage_basis_points: Option<u64>,
priority_fee: Option<PriorityFee>,
) -> Result<Signature, error::ClientError> {
// Get accounts and calculate buy amounts
let global_account = self.get_global_account()?;
let bonding_curve_account = self.get_bonding_curve_account(mint)?;
let buy_amount = bonding_curve_account
.get_buy_price(amount_sol)
.map_err(error::ClientError::BondingCurveError)?;
let buy_amount_with_slippage =
utils::calculate_with_slippage_buy(amount_sol, slippage_basis_points.unwrap_or(500));
utils::calculate_with_slippage_buy(amount_sol, slippage_basis_points.unwrap_or(DEFAULT_SLIPPAGE));
let mut request = self.program.request();
// Add priority fee if provided
if let Some(fee) = priority_fee {
if let Some(limit) = fee.limit {
let limit_ix = ComputeBudgetInstruction::set_compute_unit_limit(limit);
request = request.instruction(limit_ix);
}
request = self.add_priority_fee(request, priority_fee);
if let Some(price) = fee.price {
let price_ix = ComputeBudgetInstruction::set_compute_unit_price(price);
request = request.instruction(price_ix);
}
}
// Create Associated Token Account if needed
let ata: Pubkey = get_associated_token_address(&self.payer.pubkey(), mint);
let ata = get_associated_token_address(&self.payer.pubkey(), mint);
if self.rpc.get_account(&ata).is_err() {
request = request.instruction(create_associated_token_account(
&self.payer.pubkey(),
@@ -321,7 +218,6 @@ impl PumpFun {
));
}
// Add buy instruction
request = request.instruction(instruction::buy(
&self.payer.clone().as_ref(),
mint,
@@ -332,11 +228,8 @@ impl PumpFun {
},
));
// Add signer
request = request.signer(&self.payer);
// Send transaction
let signature: Signature = request
let signature = request
.signer(&self.payer)
.send()
.await
.map_err(error::ClientError::AnchorClientError)?;
@@ -344,7 +237,7 @@ impl PumpFun {
Ok(signature)
}
/// Buys tokens from a bonding curve with Jito
// 使用 Jito 购买代币
pub async fn buy_with_jito(
&self,
mint: &Pubkey,
@@ -354,72 +247,26 @@ impl PumpFun {
) -> Result<Signature, error::ClientError> {
let start_time = Instant::now();
if self.jito_client.is_none() {
return Err(ClientError::Other(
"Jito client not found".to_string(),
));
}
let jito_client = self.jito_client.as_ref().ok_or_else(||
ClientError::Other("Jito client not found".to_string())
)?;
// Get accounts and calculate buy amounts
let global_account = self.get_global_account()?;
// 获取 bonding curve pda
let bonding_curve_pda = Self::get_bonding_curve_pda(mint).unwrap();
// 获取 bonding curve account
let bonding_curve_account = self.get_bonding_curve_account(mint)?;
// 获取 buy amount
let buy_amount = bonding_curve_account
.get_buy_price(amount_sol)
.map_err(error::ClientError::BondingCurveError)?;
let buy_amount_with_slippage =
utils::calculate_with_slippage_buy(amount_sol, slippage_basis_points.unwrap_or(500));
utils::calculate_with_slippage_buy(amount_sol, slippage_basis_points.unwrap_or(DEFAULT_SLIPPAGE));
let mut unit_limit = DEFAULT_COMPUTE_UNIT_LIMIT;
let mut unit_price = DEFAULT_COMPUTE_UNIT_PRICE;
// 准备所有指令
let mut instructions: Vec<Instruction> = vec![];
let (unit_limit, _unit_price) = self.get_compute_units(priority_fee);
let mut instructions = self.create_priority_fee_instructions(priority_fee);
// Add priority fee if provided
if let Some(fee) = priority_fee {
if let Some(limit) = fee.limit {
unit_limit = limit;
let limit_ix = ComputeBudgetInstruction::set_compute_unit_limit(limit);
instructions.push(limit_ix);
}
if let Some(price) = fee.price {
unit_price = price;
let price_ix = ComputeBudgetInstruction::set_compute_unit_price(price);
instructions.push(price_ix);
}
}
// 获取 jito client
let jito_client = self.jito_client.as_ref().unwrap();
// 获取优先费用估算
let priority_fees = jito_client.estimate_priority_fees(&bonding_curve_pda).await?;
// 计算每计算单元的优先费用(使用 Extreme 级别)
let priority_fee_per_cu = priority_fees.per_compute_unit.extreme;
let tip_account = jito_client.get_tip_account().await?;
// 完整的单位转换过程
let total_priority_fee_microlamports = priority_fee_per_cu as u128 * unit_limit as u128;
let total_priority_fee_lamports = total_priority_fee_microlamports / 1_000_000;
let total_priority_fee_sol = total_priority_fee_lamports as f64 / 1_000_000_000.0;
println!("Priority fee details:");
println!(" Per CU (microlamports): {}", priority_fee_per_cu);
println!(" Total (lamports): {}", total_priority_fee_lamports);
println!(" Total (SOL): {:.9}", total_priority_fee_sol);
// 获取 tip account
let tip_account = jito_client.get_tip_account().await.unwrap();
// Create Associated Token Account if needed
let ata: Pubkey = get_associated_token_address(&self.payer.pubkey(), mint);
let ata = get_associated_token_address(&self.payer.pubkey(), mint);
if self.rpc.get_account(&ata).is_err() {
instructions.push(create_associated_token_account(
&self.payer.pubkey(),
@@ -429,7 +276,6 @@ impl PumpFun {
));
}
// Add buy instruction
instructions.push(instruction::buy(
&self.payer.clone().as_ref(),
mint,
@@ -440,15 +286,16 @@ impl PumpFun {
},
));
let total_priority_fee = self.calculate_priority_fee(priority_fees.per_compute_unit.extreme, unit_limit);
instructions.push(
system_instruction::transfer(
&self.payer.pubkey(),
&tip_account,
total_priority_fee_lamports as u64,
total_priority_fee,
),
);
// 创建并发送交易
let recent_blockhash = self.rpc.get_latest_blockhash()?;
let transaction = Transaction::new_signed_with_payer(
&instructions,
@@ -457,25 +304,13 @@ impl PumpFun {
recent_blockhash,
);
// 通过 Jito 发送交易
let signature = jito_client.send_transaction(&transaction).await.unwrap();
let signature = jito_client.send_transaction(&transaction).await?;
println!("Total Jito buy operation time: {:?}ms", start_time.elapsed().as_millis());
Ok(signature)
}
/// Sells tokens back to the bonding curve in exchange for SOL
///
/// # Arguments
///
/// * `mint` - Public key of the token mint to sell
/// * `amount_token` - Optional amount of tokens to sell in base units. If None, sells entire balance
/// * `slippage_basis_points` - Optional maximum acceptable slippage in basis points (1 bp = 0.01%). Defaults to 500
/// * `priority_fee` - Optional priority fee configuration for compute units
///
/// # Returns
///
/// Returns the transaction signature if successful, or a ClientError if the operation fails
// 出售代币
pub async fn sell(
&self,
mint: &Pubkey,
@@ -483,56 +318,41 @@ impl PumpFun {
slippage_basis_points: Option<u64>,
priority_fee: Option<PriorityFee>,
) -> Result<Signature, error::ClientError> {
// Get accounts and calculate sell amounts
let ata: Pubkey = get_associated_token_address(&self.payer.pubkey(), mint);
let balance = self.rpc.get_token_account_balance(&ata).unwrap();
let balance_u64: u64 = balance.amount.parse::<u64>().unwrap();
let _amount = amount_token.unwrap_or(balance_u64);
if _amount == 0 {
let ata = get_associated_token_address(&self.payer.pubkey(), mint);
let balance = self.rpc.get_token_account_balance(&ata)?;
let balance_u64 = balance.amount.parse::<u64>().unwrap();
let amount = amount_token.unwrap_or(balance_u64);
if amount == 0 {
return Err(ClientError::Other("Balance is 0".to_string()));
}
let global_account = self.get_global_account()?;
let bonding_curve_account = self.get_bonding_curve_account(mint)?;
let min_sol_output = bonding_curve_account
.get_sell_price(_amount, global_account.fee_basis_points)
.get_sell_price(amount, global_account.fee_basis_points)
.map_err(error::ClientError::BondingCurveError)?;
let _min_sol_output = utils::calculate_with_slippage_sell(
let min_sol_output_with_slippage = utils::calculate_with_slippage_sell(
min_sol_output,
slippage_basis_points.unwrap_or(500),
slippage_basis_points.unwrap_or(DEFAULT_SLIPPAGE),
);
let mut request = self.program.request();
// Add priority fee if provided
if let Some(fee) = priority_fee {
if let Some(limit) = fee.limit {
let limit_ix = ComputeBudgetInstruction::set_compute_unit_limit(limit);
request = request.instruction(limit_ix);
}
request = self.add_priority_fee(request, priority_fee);
if let Some(price) = fee.price {
let price_ix = ComputeBudgetInstruction::set_compute_unit_price(price);
request = request.instruction(price_ix);
}
}
// Add sell instruction
request = request.instruction(instruction::sell(
&self.payer.clone().as_ref(),
mint,
&global_account.fee_recipient,
cpi::instruction::Sell {
_amount,
_min_sol_output,
_amount: amount,
_min_sol_output: min_sol_output_with_slippage,
},
));
// Add signer
request = request.signer(&self.payer);
// Send transaction
let signature: Signature = request
let signature = request
.signer(&self.payer)
.send()
.await
.map_err(error::ClientError::AnchorClientError)?;
@@ -540,6 +360,7 @@ impl PumpFun {
Ok(signature)
}
// 按百分比出售代币
pub async fn sell_by_percent(
&self,
mint: &Pubkey,
@@ -547,64 +368,19 @@ impl PumpFun {
slippage_basis_points: Option<u64>,
priority_fee: Option<PriorityFee>,
) -> Result<Signature, error::ClientError> {
// Get accounts and calculate sell amounts
let ata: Pubkey = get_associated_token_address(&self.payer.pubkey(), mint);
let balance = self.rpc.get_token_account_balance(&ata).unwrap();
let balance_u64: u64 = balance.amount.parse::<u64>().unwrap();
let ata = get_associated_token_address(&self.payer.pubkey(), mint);
let balance = self.rpc.get_token_account_balance(&ata)?;
let balance_u64 = balance.amount.parse::<u64>().unwrap();
if balance_u64 == 0 {
return Err(ClientError::Other("Balance is 0".to_string()));
}
let _amount = balance_u64 * percent / 100;
let global_account = self.get_global_account()?;
let bonding_curve_account = self.get_bonding_curve_account(mint)?;
let min_sol_output = bonding_curve_account
.get_sell_price(_amount, global_account.fee_basis_points)
.map_err(error::ClientError::BondingCurveError)?;
let _min_sol_output = utils::calculate_with_slippage_sell(
min_sol_output,
slippage_basis_points.unwrap_or(500),
);
let mut request = self.program.request();
// Add priority fee if provided
if let Some(fee) = priority_fee {
if let Some(limit) = fee.limit {
let limit_ix = ComputeBudgetInstruction::set_compute_unit_limit(limit);
request = request.instruction(limit_ix);
}
if let Some(price) = fee.price {
let price_ix = ComputeBudgetInstruction::set_compute_unit_price(price);
request = request.instruction(price_ix);
}
}
// Add sell instruction
request = request.instruction(instruction::sell(
&self.payer.clone().as_ref(),
mint,
&global_account.fee_recipient,
cpi::instruction::Sell {
_amount,
_min_sol_output,
},
));
// Add signer
request = request.signer(&self.payer);
// Send transaction
let signature: Signature = request
.send()
.await
.map_err(error::ClientError::AnchorClientError)?;
Ok(signature)
let amount = balance_u64 * percent / 100;
self.sell(mint, Some(amount), slippage_basis_points, priority_fee).await
}
/// Sells tokens back to the bonding curve in exchange for SOL with Jito
// 使用 Jito 出售代币
pub async fn sell_with_jito(
&self,
mint: &Pubkey,
@@ -614,92 +390,52 @@ impl PumpFun {
) -> Result<Signature, error::ClientError> {
let start_time = Instant::now();
if self.jito_client.is_none() {
return Err(ClientError::Other(
"Jito client not found".to_string(),
));
}
let jito_client = self.jito_client.as_ref().ok_or_else(||
ClientError::Other("Jito client not found".to_string())
)?;
let ata = get_associated_token_address(&self.payer.pubkey(), mint);
let balance = self.rpc.get_token_account_balance(&ata)?;
let balance_u64 = balance.amount.parse::<u64>().unwrap();
let amount = amount_token.unwrap_or(balance_u64);
// Get accounts and calculate sell amounts
let ata: Pubkey = get_associated_token_address(&self.payer.pubkey(), mint);
let balance = self.rpc.get_token_account_balance(&ata).unwrap();
let balance_u64: u64 = balance.amount.parse::<u64>().unwrap();
let _amount = amount_token.unwrap_or(balance_u64);
let global_account = self.get_global_account()?;
let bonding_curve_pda = Self::get_bonding_curve_pda(mint).unwrap();
let bonding_curve_account = self.get_bonding_curve_account(mint)?;
let min_sol_output = bonding_curve_account
.get_sell_price(_amount, global_account.fee_basis_points)
.get_sell_price(amount, global_account.fee_basis_points)
.map_err(error::ClientError::BondingCurveError)?;
let _min_sol_output = utils::calculate_with_slippage_sell(
let min_sol_output_with_slippage = utils::calculate_with_slippage_sell(
min_sol_output,
slippage_basis_points.unwrap_or(500),
slippage_basis_points.unwrap_or(DEFAULT_SLIPPAGE),
);
let mut unit_limit = DEFAULT_COMPUTE_UNIT_LIMIT;
let mut unit_price = DEFAULT_COMPUTE_UNIT_PRICE;
// 准备所有指令
let mut instructions: Vec<Instruction> = vec![];
let (unit_limit, _unit_price) = self.get_compute_units(priority_fee);
let mut instructions = self.create_priority_fee_instructions(priority_fee);
// Add priority fee if provided
if let Some(fee) = priority_fee {
if let Some(limit) = fee.limit {
unit_limit = limit;
let limit_ix = ComputeBudgetInstruction::set_compute_unit_limit(limit);
instructions.push(limit_ix);
}
if let Some(price) = fee.price {
unit_price = price;
let price_ix = ComputeBudgetInstruction::set_compute_unit_price(price);
instructions.push(price_ix);
}
}
// 获取 jito client
let jito_client = self.jito_client.as_ref().unwrap();
// 获取优先费用估算
let priority_fees = jito_client.estimate_priority_fees(&bonding_curve_pda).await?;
// 计算每计算单元的优先费用(使用 Extreme 级别)
let priority_fee_per_cu = priority_fees.per_compute_unit.extreme;
// 完整的单位转换过程
let total_priority_fee_microlamports = priority_fee_per_cu as u128 * unit_limit as u128;
let total_priority_fee_lamports = total_priority_fee_microlamports / 1_000_000;
let total_priority_fee_sol = total_priority_fee_lamports as f64 / 1_000_000_000.0;
println!("Priority fee details:");
println!(" Per CU (microlamports): {}", priority_fee_per_cu);
println!(" Total (lamports): {}", total_priority_fee_lamports);
println!(" Total (SOL): {:.9}", total_priority_fee_sol);
let tip_account = jito_client.get_tip_account().await?;
// 获取 tip account
let tip_account = jito_client.get_tip_account().await.unwrap();
// Add buy instruction
instructions.push(instruction::sell(
&self.payer.clone().as_ref(),
mint,
&global_account.fee_recipient,
cpi::instruction::Sell {
_amount,
_min_sol_output,
_amount: amount,
_min_sol_output: min_sol_output_with_slippage,
},
));
// 添加 tip 指令
let total_priority_fee = self.calculate_priority_fee(priority_fees.per_compute_unit.extreme, unit_limit);
instructions.push(
system_instruction::transfer(
&self.payer.pubkey(),
&tip_account,
total_priority_fee_lamports as u64,
total_priority_fee,
),
);
// 创建并发送交易
let recent_blockhash = self.rpc.get_latest_blockhash()?;
let transaction = Transaction::new_signed_with_payer(
&instructions,
@@ -708,123 +444,130 @@ impl PumpFun {
recent_blockhash,
);
// 通过 Jito 发送交易
let signature = jito_client.send_transaction(&transaction).await.unwrap();
let signature = jito_client.send_transaction(&transaction).await?;
println!("Total Jito sell operation time: {:?}ms", start_time.elapsed().as_millis());
Ok(signature)
}
// 辅助方法
fn add_priority_fee<'a>(
&self,
request: anchor_client::RequestBuilder<'a, Arc<Keypair>>,
priority_fee: Option<PriorityFee>,
) -> anchor_client::RequestBuilder<'a, Arc<Keypair>> {
let mut request = request;
if let Some(fee) = priority_fee {
if let Some(limit) = fee.limit {
request = request.instruction(ComputeBudgetInstruction::set_compute_unit_limit(limit));
}
if let Some(price) = fee.price {
request = request.instruction(ComputeBudgetInstruction::set_compute_unit_price(price));
}
}
request
}
fn get_compute_units(&self, priority_fee: Option<PriorityFee>) -> (u32, u64) {
let unit_limit = priority_fee
.and_then(|fee| fee.limit)
.unwrap_or(DEFAULT_COMPUTE_UNIT_LIMIT);
let unit_price = priority_fee
.and_then(|fee| fee.price)
.unwrap_or(DEFAULT_COMPUTE_UNIT_PRICE);
(unit_limit, unit_price)
}
fn create_priority_fee_instructions(&self, priority_fee: Option<PriorityFee>) -> Vec<Instruction> {
let mut instructions = Vec::new();
if let Some(fee) = priority_fee {
if let Some(limit) = fee.limit {
instructions.push(ComputeBudgetInstruction::set_compute_unit_limit(limit));
}
if let Some(price) = fee.price {
instructions.push(ComputeBudgetInstruction::set_compute_unit_price(price));
}
}
instructions
}
fn calculate_priority_fee(&self, priority_fee_per_cu: u64, unit_limit: u32) -> u64 {
let total_priority_fee_microlamports = priority_fee_per_cu as u128 * unit_limit as u128;
(total_priority_fee_microlamports / 1_000_000) as u64
}
// 公共接口方法
pub fn get_payer_pubkey(&self) -> Pubkey {
self.payer.pubkey()
}
pub fn get_token_balance(&self, account: &Pubkey, mint: &Pubkey) -> Result<u64, error::ClientError> {
let ata: Pubkey = get_associated_token_address(account, mint);
let balance = self.rpc.get_token_account_balance(&ata).unwrap();
let balance_u64: u64 = balance.amount.parse::<u64>().unwrap();
Ok(balance_u64)
let ata = get_associated_token_address(account, mint);
let balance = self.rpc.get_token_account_balance(&ata)?;
Ok(balance.amount.parse::<u64>().unwrap())
}
/// Gets the Program Derived Address (PDA) for the global state account
///
/// # Returns
///
/// Returns the PDA public key derived from the GLOBAL_SEED
pub fn get_sol_balance(&self, account: &Pubkey) -> Result<u64, error::ClientError> {
self.rpc.get_balance(account).map_err(error::ClientError::SolanaClientError)
}
pub fn get_payer_token_balance(&self, mint: &Pubkey) -> Result<u64, error::ClientError> {
self.get_token_balance(&self.payer.pubkey(), mint)
}
pub fn get_payer_sol_balance(&self) -> Result<u64, error::ClientError> {
self.get_sol_balance(&self.payer.pubkey())
}
// PDA 相关方法
pub fn get_global_pda() -> Pubkey {
let seeds: &[&[u8]; 1] = &[constants::seeds::GLOBAL_SEED];
let program_id: &Pubkey = &cpi::ID;
Pubkey::find_program_address(seeds, program_id).0
Pubkey::find_program_address(&[constants::seeds::GLOBAL_SEED], &cpi::ID).0
}
/// Gets the Program Derived Address (PDA) for the mint authority
///
/// # Returns
///
/// Returns the PDA public key derived from the MINT_AUTHORITY_SEED
pub fn get_mint_authority_pda() -> Pubkey {
let seeds: &[&[u8]; 1] = &[constants::seeds::MINT_AUTHORITY_SEED];
let program_id: &Pubkey = &cpi::ID;
Pubkey::find_program_address(seeds, program_id).0
Pubkey::find_program_address(&[constants::seeds::MINT_AUTHORITY_SEED], &cpi::ID).0
}
/// Gets the Program Derived Address (PDA) for a token's bonding curve account
///
/// # Arguments
///
/// * `mint` - Public key of the token mint
///
/// # Returns
///
/// Returns Some(PDA) if derivation succeeds, or None if it fails
pub fn get_bonding_curve_pda(mint: &Pubkey) -> Option<Pubkey> {
let seeds: &[&[u8]; 2] = &[constants::seeds::BONDING_CURVE_SEED, mint.as_ref()];
let program_id: &Pubkey = &cpi::ID;
let pda: Option<(Pubkey, u8)> = Pubkey::try_find_program_address(seeds, program_id);
pda.map(|pubkey| pubkey.0)
Pubkey::try_find_program_address(
&[constants::seeds::BONDING_CURVE_SEED, mint.as_ref()],
&cpi::ID
).map(|(pubkey, _)| pubkey)
}
/// Gets the Program Derived Address (PDA) for a token's metadata account
///
/// # Arguments
///
/// * `mint` - Public key of the token mint
///
/// # Returns
///
/// Returns the PDA public key for the token's metadata account
pub fn get_metadata_pda(mint: &Pubkey) -> Pubkey {
let seeds: &[&[u8]; 3] = &[
constants::seeds::METADATA_SEED,
constants::accounts::MPL_TOKEN_METADATA.as_ref(),
mint.as_ref(),
];
let program_id: &Pubkey = &constants::accounts::MPL_TOKEN_METADATA;
Pubkey::find_program_address(seeds, program_id).0
Pubkey::find_program_address(
&[
constants::seeds::METADATA_SEED,
constants::accounts::MPL_TOKEN_METADATA.as_ref(),
mint.as_ref(),
],
&constants::accounts::MPL_TOKEN_METADATA
).0
}
/// Gets the global state account data containing program-wide configuration
///
/// # Returns
///
/// Returns the deserialized GlobalAccount if successful, or a ClientError if the operation fails
// 账户相关方法
pub fn get_global_account(&self) -> Result<accounts::GlobalAccount, error::ClientError> {
let global: Pubkey = Self::get_global_pda();
let account = self
.rpc
.get_account(&global)
let global = Self::get_global_pda();
let account = self.rpc.get_account(&global)
.map_err(error::ClientError::SolanaClientError)?;
accounts::GlobalAccount::try_from_slice(&account.data)
.map_err(error::ClientError::BorshError)
}
/// Gets a token's bonding curve account data containing pricing parameters
///
/// # Arguments
///
/// * `mint` - Public key of the token mint
///
/// # Returns
///
/// Returns the deserialized BondingCurveAccount if successful, or a ClientError if the operation fails
pub fn get_bonding_curve_account(
&self,
mint: &Pubkey,
) -> Result<accounts::BondingCurveAccount, error::ClientError> {
let bonding_curve_pda =
Self::get_bonding_curve_pda(mint).ok_or(error::ClientError::BondingCurveNotFound)?;
let account = self
.rpc
.get_account(&bonding_curve_pda)
let bonding_curve_pda = Self::get_bonding_curve_pda(mint)
.ok_or(error::ClientError::BondingCurveNotFound)?;
let account = self.rpc.get_account(&bonding_curve_pda)
.map_err(error::ClientError::SolanaClientError)?;
accounts::BondingCurveAccount::try_from_slice(&account.data)
.map_err(error::ClientError::BorshError)
}
// 订阅相关方法
pub async fn tokens_subscription<F>(
&self,
ws_url: &str,
@@ -843,18 +586,14 @@ impl PumpFun {
}
}
// use crate::instruction::logs_subscribe::{start_subscription, stop_subscription, SubscriptionHandle};
#[cfg(test)]
mod tests {
use super::*;
use anchor_client::solana_sdk::signer::keypair::Keypair;
#[test]
fn test_new_client() {
let payer = Arc::new(Keypair::new());
let client = PumpFun::new(Cluster::Devnet, None,Arc::clone(&payer), None, None);
let client = PumpFun::new(Cluster::Devnet, None, Arc::clone(&payer), None, None);
assert_eq!(client.payer.pubkey(), payer.pubkey());
}
-3
View File
@@ -4,9 +4,6 @@ use mai3_pumpfun_sdk::instruction::{
};
use anchor_client::solana_sdk::commitment_config::CommitmentConfig;
use std::str::FromStr;
use tokio::signal;
#[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error>> {
println!("Starting token subscription\n");