From 794207b6c220ddd5f94b7246d1e9e2c01e5898fa Mon Sep 17 00:00:00 2001 From: wood Date: Thu, 10 Jul 2025 02:47:52 +0800 Subject: [PATCH] update dir --- src/main.rs | 10 +++------- src/trading/bonk/sell.rs | 7 ++++--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main.rs b/src/main.rs index c46e9f3..d970b9b 100755 --- a/src/main.rs +++ b/src/main.rs @@ -6,22 +6,18 @@ use sol_trade_sdk::{ constants::{pumpfun::global_constants::TOKEN_TOTAL_SUPPLY, trade_type}, event_parser::{ protocols::{ - pumpfun::{PumpFunCreateTokenEvent, PumpFunTradeEvent}, - pumpswap::{ + bonk::{BonkPoolCreateEvent, BonkTradeEvent}, pumpfun::{PumpFunCreateTokenEvent, PumpFunTradeEvent}, pumpswap::{ PumpSwapBuyEvent, PumpSwapCreatePoolEvent, PumpSwapDepositEvent, PumpSwapSellEvent, PumpSwapWithdrawEvent, - }, - bonk::{BonkPoolCreateEvent, BonkTradeEvent}, + } }, Protocol, UnifiedEvent, }, grpc::{ShredStreamGrpc, YellowstoneGrpc}, match_event, - pumpfun::common::get_bonding_curve_account_v2, swqos::{SwqosConfig, SwqosRegion}, trading::{ - core::params::{PumpFunParams, PumpFunSellParams, PumpSwapParams, BonkParams}, - BuyParams, SellParams, + core::params::{BonkParams, PumpFunParams, PumpFunSellParams, PumpSwapParams}, pumpfun::common::get_bonding_curve_account_v2, BuyParams, SellParams }, SolanaTrade, }; diff --git a/src/trading/bonk/sell.rs b/src/trading/bonk/sell.rs index 33f60ab..3f519fb 100755 --- a/src/trading/bonk/sell.rs +++ b/src/trading/bonk/sell.rs @@ -1,10 +1,11 @@ use anyhow::anyhow; use solana_hash::Hash; use solana_sdk::{pubkey::Pubkey, signature::Keypair}; +use solana_sdk::signature::Signer; use std::sync::Arc; use crate::common::{PriorityFee, SolanaRpcClient}; -use crate::pumpswap::common::get_token_balance; +use crate::trading::bonk::common::get_token_balance; use crate::swqos::SwqosClient; use crate::trading::{ core::params::BonkParams, factory::Protocol, SellParams, TradeFactory, @@ -70,7 +71,7 @@ pub async fn sell_by_percent( if percent == 0 || percent > 100 { return Err(anyhow!("Percentage must be between 1 and 100")); } - let (balance_u64, _) = get_token_balance(rpc.as_ref(), payer.as_ref(), &mint).await?; + let balance_u64 = get_token_balance(&rpc, &payer.pubkey(), &mint).await?; let amount = balance_u64 * percent / 100; sell( rpc, @@ -185,7 +186,7 @@ pub async fn sell_by_percent_with_tip( return Err(anyhow!("Percentage must be between 1 and 100")); } - let (balance_u64, _) = get_token_balance(rpc.as_ref(), payer.as_ref(), &mint).await?; + let balance_u64 = get_token_balance(&rpc, &payer.pubkey(), &mint).await?; let amount = balance_u64 * percent / 100; sell_with_tip( rpc,