diff --git a/src/constants/mod.rs b/src/constants/mod.rs index bf883d5..8aedab2 100755 --- a/src/constants/mod.rs +++ b/src/constants/mod.rs @@ -55,6 +55,6 @@ pub mod accounts { pub mod trade { pub const JITO_TIP_AMOUNT: f64 = 0.0001; pub const DEFAULT_SLIPPAGE: u64 = 3000; // 30% - pub const DEFAULT_COMPUTE_UNIT_LIMIT: u32 = 78000; - pub const DEFAULT_COMPUTE_UNIT_PRICE: u64 = 500000; + pub const DEFAULT_COMPUTE_UNIT_LIMIT: f64 = 78000.0; + pub const DEFAULT_COMPUTE_UNIT_PRICE: f64 = 500000.0; } diff --git a/src/lib.rs b/src/lib.rs index 7203f48..86c92db 100755 --- a/src/lib.rs +++ b/src/lib.rs @@ -71,7 +71,7 @@ impl PumpFun { &self, mint: &Keypair, ipfs: TokenMetadataIPFS, - priority_fee: Option, + priority_fee: PriorityFee, ) -> Result { trade::create::create( &self.rpc, @@ -88,7 +88,7 @@ impl PumpFun { ipfs: TokenMetadataIPFS, amount_sol: u64, slippage_basis_points: Option, - priority_fee: Option, + priority_fee: PriorityFee, ) -> Result { trade::create::create_and_buy( &self.rpc, @@ -108,7 +108,7 @@ impl PumpFun { ipfs: TokenMetadataIPFS, amount_sols: Vec, slippage_basis_points: Option, - jito_fee: Option, + priority_fee: PriorityFee, ) -> Result { trade::create::create_and_buy_list_with_jito( &self.rpc, @@ -118,7 +118,7 @@ impl PumpFun { ipfs, amount_sols, slippage_basis_points, - jito_fee, + priority_fee, ).await } @@ -129,7 +129,7 @@ impl PumpFun { ipfs: TokenMetadataIPFS, amount_sol: u64, slippage_basis_points: Option, - jito_fee: Option, + priority_fee: PriorityFee, ) -> Result { trade::create::create_and_buy_with_jito( &self.rpc, @@ -139,7 +139,7 @@ impl PumpFun { ipfs, amount_sol, slippage_basis_points, - jito_fee, + priority_fee, ).await } /// Buy tokens @@ -148,7 +148,7 @@ impl PumpFun { mint: &Pubkey, amount_sol: u64, slippage_basis_points: Option, - priority_fee: Option, + priority_fee: PriorityFee, ) -> Result { trade::buy::buy( &self.rpc, @@ -166,7 +166,7 @@ impl PumpFun { mint: &Pubkey, amount_sol: u64, slippage_basis_points: Option, - jito_fee: Option, + priority_fee: PriorityFee, ) -> Result { trade::buy::buy_with_jito( &self.rpc, @@ -175,7 +175,7 @@ impl PumpFun { mint, amount_sol, slippage_basis_points, - jito_fee, + priority_fee, ).await } @@ -185,7 +185,7 @@ impl PumpFun { mint: &Pubkey, amount_sols: Vec, slippage_basis_points: Option, - jito_fee: Option, + priority_fee: PriorityFee, ) -> Result { trade::buy::buy_list_with_jito( &self.rpc, @@ -194,7 +194,7 @@ impl PumpFun { mint, amount_sols, slippage_basis_points, - jito_fee, + priority_fee, ).await } @@ -204,7 +204,7 @@ impl PumpFun { mint: &Pubkey, amount_token: Option, slippage_basis_points: Option, - priority_fee: Option, + priority_fee: PriorityFee, ) -> Result { trade::sell::sell( &self.rpc, @@ -222,7 +222,7 @@ impl PumpFun { mint: &Pubkey, percent: u64, slippage_basis_points: Option, - priority_fee: Option, + priority_fee: PriorityFee, ) -> Result { trade::sell::sell_by_percent( &self.rpc, @@ -239,7 +239,7 @@ impl PumpFun { mint: &Pubkey, percent: u64, slippage_basis_points: Option, - jito_fee: Option, + priority_fee: PriorityFee, ) -> Result { trade::sell::sell_by_percent_with_jito( &self.rpc, @@ -248,8 +248,8 @@ impl PumpFun { mint, percent, slippage_basis_points, - jito_fee, - ).await + priority_fee, + ).await } /// Sell tokens using Jito @@ -258,7 +258,7 @@ impl PumpFun { mint: &Pubkey, amount_token: Option, slippage_basis_points: Option, - jito_fee: Option, + priority_fee: PriorityFee, ) -> Result { let jito_client = self.jito_client.as_ref() .ok_or_else(|| anyhow!("Jito client not found"))?; @@ -270,7 +270,7 @@ impl PumpFun { mint, amount_token, slippage_basis_points, - jito_fee, + priority_fee, ).await } diff --git a/src/trade/buy.rs b/src/trade/buy.rs index 1d9543c..87e81ec 100755 --- a/src/trade/buy.rs +++ b/src/trade/buy.rs @@ -19,7 +19,7 @@ pub async fn buy( mint: &Pubkey, amount_sol: u64, slippage_basis_points: Option, - priority_fee: Option, + priority_fee: PriorityFee, ) -> Result { let transaction = build_buy_transaction(rpc, payer, mint, amount_sol, slippage_basis_points, priority_fee).await?; let signature = rpc.send_transaction(&transaction)?; @@ -34,11 +34,11 @@ pub async fn buy_with_jito( mint: &Pubkey, amount_sol: u64, slippage_basis_points: Option, - jito_fee: Option, + priority_fee: PriorityFee, ) -> Result { let start_time = Instant::now(); - let transaction = build_buy_transaction_with_jito(rpc, jito_client, payer, mint, amount_sol, slippage_basis_points, jito_fee).await?; + let transaction = build_buy_transaction_with_jito(rpc, jito_client, payer, mint, amount_sol, slippage_basis_points, priority_fee).await?; let signature = jito_client.send_transaction(&transaction).await?; println!("Total Jito buy operation time: {:?}ms", start_time.elapsed().as_millis()); @@ -53,13 +53,13 @@ pub async fn buy_list_with_jito( mint: &Pubkey, amount_sols: Vec, slippage_basis_points: Option, - jito_fee: Option, + priority_fee: PriorityFee, ) -> Result { let start_time = Instant::now(); let mut transactions = vec![]; for (i, payer) in payers.iter().enumerate() { - let transaction = build_buy_transaction_with_jito(rpc, jito_client, payer, mint, amount_sols[i], slippage_basis_points, jito_fee).await?; + let transaction = build_buy_transaction_with_jito(rpc, jito_client, payer, mint, amount_sols[i], slippage_basis_points, priority_fee).await?; transactions.push(transaction); } @@ -76,7 +76,7 @@ pub async fn build_buy_transaction( mint: &Pubkey, amount_sol: u64, slippage_basis_points: Option, - priority_fee: Option, + priority_fee: PriorityFee, ) -> Result { let instructions = build_buy_instructions(rpc, payer, mint, amount_sol, slippage_basis_points, priority_fee).await?; @@ -98,9 +98,9 @@ pub async fn build_buy_transaction_with_jito( mint: &Pubkey, amount_sol: u64, slippage_basis_points: Option, - jito_fee: Option, + priority_fee: PriorityFee, ) -> Result { - let instructions = build_buy_instructions_with_jito(rpc, jito_client, payer, mint, amount_sol, slippage_basis_points, jito_fee).await?; + let instructions = build_buy_instructions_with_jito(rpc, jito_client, payer, mint, amount_sol, slippage_basis_points, priority_fee).await?; let recent_blockhash = rpc.get_latest_blockhash()?; let transaction = Transaction::new_signed_with_payer( &instructions, @@ -118,7 +118,7 @@ pub async fn build_buy_instructions( mint: &Pubkey, amount_sol: u64, slippage_basis_points: Option, - priority_fee: Option, + priority_fee: PriorityFee, ) -> Result, anyhow::Error> { if amount_sol == 0 { return Err(anyhow!("Amount cannot be zero")); @@ -183,20 +183,14 @@ pub async fn build_buy_instructions( let result_cu = result.units_consumed.ok_or_else(|| anyhow!("No compute units consumed"))?; let fees = rpc.get_recent_prioritization_fees(&[])?; let average_fees = if fees.is_empty() { - DEFAULT_COMPUTE_UNIT_PRICE + sol_to_lamports(DEFAULT_COMPUTE_UNIT_PRICE) } else { fees.iter() .map(|fee| fee.prioritization_fee) .sum::() / fees.len() as u64 }; - let unit_price = match priority_fee { - None => average_fees, - Some(pf) => pf.price.unwrap_or(DEFAULT_COMPUTE_UNIT_PRICE) - }; - - let unit_price = if unit_price == 0 { DEFAULT_COMPUTE_UNIT_PRICE } else { unit_price }; - + let unit_price = if average_fees == 0 { sol_to_lamports(priority_fee.price) } else { average_fees }; instructions[0] = ComputeBudgetInstruction::set_compute_unit_limit(result_cu as u32); instructions[1] = ComputeBudgetInstruction::set_compute_unit_price(unit_price); @@ -211,7 +205,7 @@ pub async fn build_buy_instructions_with_jito( mint: &Pubkey, amount_sol: u64, slippage_basis_points: Option, - jito_fee: Option, + priority_fee: PriorityFee, ) -> Result, anyhow::Error> { if amount_sol == 0 { return Err(anyhow!("Amount cannot be zero")); @@ -228,7 +222,11 @@ pub async fn build_buy_instructions_with_jito( let buy_amount_with_slippage = calculate_with_slippage_buy(amount_sol, slippage_basis_points.unwrap_or(DEFAULT_SLIPPAGE)); - let mut instructions = vec![]; + let mut instructions = vec![ + ComputeBudgetInstruction::set_compute_unit_price(sol_to_lamports(priority_fee.price)), + ComputeBudgetInstruction::set_compute_unit_limit(sol_to_lamports(priority_fee.limit) as u32), + ]; + let ata = get_associated_token_address(&payer.pubkey(), mint); if rpc.get_account(&ata).is_err() { instructions.push(create_associated_token_account( @@ -251,7 +249,7 @@ pub async fn build_buy_instructions_with_jito( let tip_account = jito_client.get_tip_account().await.map_err(|e| anyhow!(e))?; - let jito_fee = jito_fee.unwrap_or(JITO_TIP_AMOUNT); + let jito_fee = priority_fee.jito_fee.unwrap_or(JITO_TIP_AMOUNT); instructions.push( system_instruction::transfer( &payer.pubkey(), diff --git a/src/trade/common.rs b/src/trade/common.rs index 79a7b64..a0ff0cd 100755 --- a/src/trade/common.rs +++ b/src/trade/common.rs @@ -3,7 +3,7 @@ use tokio::sync::RwLock; use std::{collections::HashMap, sync::Arc}; use solana_client::rpc_client::RpcClient; use solana_sdk::{ - compute_budget::ComputeBudgetInstruction, instruction::Instruction, pubkey::Pubkey, signature::Keypair, signer::Signer, system_instruction, transaction::Transaction + compute_budget::ComputeBudgetInstruction, instruction::Instruction, native_token::sol_to_lamports, pubkey::Pubkey, signature::Keypair, signer::Signer, system_instruction, transaction::Transaction }; use spl_associated_token_account::get_associated_token_address; use crate::{accounts, common::logs_data::TradeInfo, constants::{self, trade::{DEFAULT_COMPUTE_UNIT_LIMIT, DEFAULT_COMPUTE_UNIT_PRICE, DEFAULT_SLIPPAGE}}}; @@ -13,15 +13,16 @@ lazy_static::lazy_static! { static ref ACCOUNT_CACHE: RwLock>> = RwLock::new(HashMap::new()); } -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Clone, Copy, PartialEq)] pub struct PriorityFee { - pub limit: Option, - pub price: Option, + pub limit: f64, + pub price: f64, + pub jito_fee: Option, } impl Default for PriorityFee { fn default() -> Self { - Self { limit: Some(DEFAULT_COMPUTE_UNIT_LIMIT), price: Some(DEFAULT_COMPUTE_UNIT_PRICE) } + Self { limit: DEFAULT_COMPUTE_UNIT_LIMIT, price: DEFAULT_COMPUTE_UNIT_PRICE, jito_fee: None } } } @@ -56,15 +57,10 @@ pub async fn transfer_sol(rpc: &RpcClient, payer: &Keypair, receive_wallet: &Pub } #[inline] -pub fn create_priority_fee_instructions(priority_fee: Option) -> Vec { +pub fn create_priority_fee_instructions(priority_fee: PriorityFee) -> Vec { let mut instructions = Vec::with_capacity(2); - let fee = priority_fee.unwrap_or(PriorityFee::default()); - 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.push(ComputeBudgetInstruction::set_compute_unit_limit(sol_to_lamports(priority_fee.limit) as u32)); + instructions.push(ComputeBudgetInstruction::set_compute_unit_price(sol_to_lamports(priority_fee.price))); instructions } diff --git a/src/trade/create.rs b/src/trade/create.rs index 1dc2dfc..e079835 100755 --- a/src/trade/create.rs +++ b/src/trade/create.rs @@ -10,7 +10,7 @@ use spl_associated_token_account::{ instruction::create_associated_token_account, }; -use crate::{constants::{self, trade::{DEFAULT_COMPUTE_UNIT_PRICE, JITO_TIP_AMOUNT}}, instruction, ipfs::TokenMetadataIPFS, jito::JitoClient, trade::buy::build_buy_transaction_with_jito}; +use crate::{constants::{self, trade::JITO_TIP_AMOUNT}, instruction, ipfs::TokenMetadataIPFS, jito::JitoClient, trade::buy::build_buy_transaction_with_jito}; use super::common::{create_priority_fee_instructions, get_buy_amount_with_slippage, get_global_account, PriorityFee}; @@ -20,7 +20,7 @@ pub async fn create( payer: &Keypair, mint: &Keypair, ipfs: TokenMetadataIPFS, - priority_fee: Option, + priority_fee: PriorityFee, ) -> Result { let mut instructions = create_priority_fee_instructions(priority_fee); @@ -55,7 +55,7 @@ pub async fn create_and_buy( ipfs: TokenMetadataIPFS, amount_sol: u64, slippage_basis_points: Option, - priority_fee: Option, + priority_fee: PriorityFee, ) -> Result { if amount_sol == 0 { return Err(anyhow!("Amount cannot be zero")); @@ -75,18 +75,18 @@ pub async fn create_and_buy_list_with_jito( ipfs: TokenMetadataIPFS, amount_sols: Vec, slippage_basis_points: Option, - jito_fee: Option, + priority_fee: PriorityFee, ) -> Result { let start_time = Instant::now(); let mut transactions = Vec::new(); - let transaction = build_create_and_buy_transaction_with_jito(rpc, jito_client, payers[0], mint, ipfs, amount_sols[0], slippage_basis_points, jito_fee).await?; + let transaction = build_create_and_buy_transaction_with_jito(rpc, jito_client, payers[0], mint, ipfs, amount_sols[0], slippage_basis_points, priority_fee).await?; transactions.push(transaction); for (i, payer) in payers.iter().skip(1).enumerate() { println!("Creating and buying token index: {}", i); - let buy_transaction = build_buy_transaction_with_jito(rpc, jito_client, payer, &mint.pubkey(), amount_sols[i], slippage_basis_points, jito_fee).await?; + let buy_transaction = build_buy_transaction_with_jito(rpc, jito_client, payer, &mint.pubkey(), amount_sols[i], slippage_basis_points, priority_fee).await?; transactions.push(buy_transaction); } @@ -105,12 +105,12 @@ pub async fn create_and_buy_with_jito( ipfs: TokenMetadataIPFS, amount_sol: u64, slippage_basis_points: Option, - jito_fee: Option, + priority_fee: PriorityFee, ) -> Result { let start_time = Instant::now(); - let transaction = build_create_and_buy_transaction_with_jito(rpc, jito_client, payer, mint, ipfs, amount_sol, slippage_basis_points, jito_fee).await?; + let transaction = build_create_and_buy_transaction_with_jito(rpc, jito_client, payer, mint, ipfs, amount_sol, slippage_basis_points, priority_fee).await?; let signature = jito_client.send_transaction(&transaction).await?; @@ -126,7 +126,7 @@ pub async fn build_create_and_buy_transaction( ipfs: TokenMetadataIPFS, amount_sol: u64, slippage_basis_points: Option, - priority_fee: Option, + priority_fee: PriorityFee, ) -> Result { let instructions = build_create_and_buy_instructions(rpc, payer, mint, ipfs, amount_sol, slippage_basis_points, priority_fee).await?; let recent_blockhash = rpc.get_latest_blockhash()?; @@ -148,9 +148,9 @@ pub async fn build_create_and_buy_transaction_with_jito( ipfs: TokenMetadataIPFS, amount_sol: u64, slippage_basis_points: Option, - jito_fee: Option, + priority_fee: PriorityFee, ) -> Result { - let instructions = build_create_and_buy_instructions_with_jito(rpc, jito_client, payer, mint, ipfs, amount_sol, slippage_basis_points, jito_fee).await?; + let instructions = build_create_and_buy_instructions_with_jito(rpc, jito_client, payer, mint, ipfs, amount_sol, slippage_basis_points, priority_fee).await?; let recent_blockhash = rpc.get_latest_blockhash()?; let transaction = Transaction::new_signed_with_payer( &instructions, @@ -169,7 +169,7 @@ pub async fn build_create_and_buy_instructions( ipfs: TokenMetadataIPFS, amount_sol: u64, slippage_basis_points: Option, - priority_fee: Option, + priority_fee: PriorityFee, ) -> Result, anyhow::Error> { if amount_sol == 0 { return Err(anyhow!("Amount cannot be zero")); @@ -242,19 +242,15 @@ pub async fn build_create_and_buy_instructions( let result_cu = result.units_consumed.ok_or_else(|| anyhow!("No compute units consumed"))?; let fees = rpc.get_recent_prioritization_fees(&[])?; let average_fees = if fees.is_empty() { - DEFAULT_COMPUTE_UNIT_PRICE + sol_to_lamports(priority_fee.price) } else { fees.iter() .map(|fee| fee.prioritization_fee) .sum::() / fees.len() as u64 }; - let unit_price = match priority_fee { - None => average_fees, - Some(pf) => pf.price.unwrap_or(DEFAULT_COMPUTE_UNIT_PRICE) - }; - let unit_price = if unit_price == 0 { DEFAULT_COMPUTE_UNIT_PRICE } else { unit_price }; + let unit_price = if average_fees == 0 { sol_to_lamports(priority_fee.price) } else { average_fees }; instructions[0] = ComputeBudgetInstruction::set_compute_unit_limit(result_cu as u32); instructions[1] = ComputeBudgetInstruction::set_compute_unit_price(unit_price); @@ -270,7 +266,7 @@ pub async fn build_create_and_buy_instructions_with_jito( ipfs: TokenMetadataIPFS, amount_sol: u64, slippage_basis_points: Option, - jito_fee: Option, + priority_fee: PriorityFee, ) -> Result, anyhow::Error> { if amount_sol == 0 { return Err(anyhow!("Amount cannot be zero")); @@ -281,7 +277,11 @@ pub async fn build_create_and_buy_instructions_with_jito( let buy_amount_with_slippage = get_buy_amount_with_slippage(amount_sol, slippage_basis_points); - let mut instructions = vec![]; + let mut instructions = vec![ + ComputeBudgetInstruction::set_compute_unit_price(sol_to_lamports(priority_fee.price)), + ComputeBudgetInstruction::set_compute_unit_limit(sol_to_lamports(priority_fee.limit) as u32), + ]; + instructions.push(instruction::create( payer, mint, @@ -313,7 +313,7 @@ pub async fn build_create_and_buy_instructions_with_jito( )); let tip_account = jito_client.get_tip_account().await.map_err(|e| anyhow!(e))?; - let jito_fee = jito_fee.unwrap_or(JITO_TIP_AMOUNT); + let jito_fee = priority_fee.jito_fee.unwrap_or(JITO_TIP_AMOUNT); instructions.push( system_instruction::transfer( &payer.pubkey(), diff --git a/src/trade/sell.rs b/src/trade/sell.rs index 3a1791b..51d08d3 100755 --- a/src/trade/sell.rs +++ b/src/trade/sell.rs @@ -31,7 +31,7 @@ pub async fn sell( mint: &Pubkey, amount_token: Option, slippage_basis_points: Option, - priority_fee: Option, + priority_fee: PriorityFee, ) -> Result { let transaction = build_sell_transaction(rpc, payer, mint, amount_token, slippage_basis_points, priority_fee).await?; @@ -47,7 +47,7 @@ pub async fn sell_by_percent( mint: &Pubkey, percent: u64, slippage_basis_points: Option, - priority_fee: Option, + priority_fee: PriorityFee, ) -> Result { if percent == 0 || percent > 100 { return Err(anyhow!("Percentage must be between 1 and 100")); @@ -65,7 +65,7 @@ pub async fn sell_by_percent_with_jito( mint: &Pubkey, percent: u64, slippage_basis_points: Option, - jito_fee: Option, + priority_fee: PriorityFee, ) -> Result { if percent == 0 || percent > 100 { return Err(anyhow!("Percentage must be between 1 and 100")); @@ -73,7 +73,7 @@ pub async fn sell_by_percent_with_jito( let (balance_u64, _) = get_token_balance(rpc, payer, mint).await?; let amount = balance_u64 * percent / 100; - sell_with_jito(rpc, payer, jito_client, mint, Some(amount), slippage_basis_points, jito_fee).await + sell_with_jito(rpc, payer, jito_client, mint, Some(amount), slippage_basis_points, priority_fee).await } /// Sell tokens using Jito @@ -84,11 +84,11 @@ pub async fn sell_with_jito( mint: &Pubkey, amount_token: Option, slippage_basis_points: Option, - jito_fee: Option, + priority_fee: PriorityFee, ) -> Result { let start_time = Instant::now(); - let transaction = build_sell_transaction_with_jito(rpc, jito_client, payer, mint, amount_token, slippage_basis_points, jito_fee).await?; + let transaction = build_sell_transaction_with_jito(rpc, jito_client, payer, mint, amount_token, slippage_basis_points, priority_fee).await?; let signature = jito_client.send_transaction(&transaction).await?; println!("Total Jito sell operation time: {:?}ms, signature: {}", start_time.elapsed().as_millis(), signature); @@ -102,7 +102,7 @@ pub async fn build_sell_transaction( mint: &Pubkey, amount_token: Option, slippage_basis_points: Option, - priority_fee: Option, + priority_fee: PriorityFee, ) -> Result { let instructions = build_sell_instructions(rpc, payer, mint, amount_token, slippage_basis_points, priority_fee).await?; let recent_blockhash = rpc.get_latest_blockhash()?; @@ -123,9 +123,9 @@ pub async fn build_sell_transaction_with_jito( mint: &Pubkey, amount_token: Option, slippage_basis_points: Option, - jito_fee: Option, + priority_fee: PriorityFee, ) -> Result { - let instructions = build_sell_instructions_with_jito(rpc, jito_client, payer, mint, amount_token, slippage_basis_points, jito_fee).await?; + let instructions = build_sell_instructions_with_jito(rpc, jito_client, payer, mint, amount_token, slippage_basis_points, priority_fee).await?; let recent_blockhash = rpc.get_latest_blockhash()?; let transaction = Transaction::new_signed_with_payer( &instructions, @@ -143,7 +143,7 @@ pub async fn build_sell_instructions( mint: &Pubkey, amount_token: Option, slippage_basis_points: Option, - priority_fee: Option, + priority_fee: PriorityFee, ) -> Result, anyhow::Error> { let (balance_u64, ata) = get_token_balance(rpc, payer, mint).await?; let amount = amount_token.unwrap_or(balance_u64); @@ -212,20 +212,14 @@ pub async fn build_sell_instructions( let result_cu = result.units_consumed.ok_or_else(|| anyhow!("No compute units consumed"))?; let fees = rpc.get_recent_prioritization_fees(&[])?; let average_fees = if fees.is_empty() { - DEFAULT_COMPUTE_UNIT_PRICE + sol_to_lamports(DEFAULT_COMPUTE_UNIT_PRICE) } else { fees.iter() .map(|fee| fee.prioritization_fee) .sum::() / fees.len() as u64 }; - let unit_price = match priority_fee { - None => average_fees, - Some(pf) => pf.price.unwrap_or(DEFAULT_COMPUTE_UNIT_PRICE) - }; - - let unit_price = if unit_price == 0 { DEFAULT_COMPUTE_UNIT_PRICE } else { unit_price }; - + let unit_price = if average_fees == 0 { sol_to_lamports(priority_fee.price) } else { average_fees }; instructions[0] = ComputeBudgetInstruction::set_compute_unit_limit(result_cu as u32); instructions[1] = ComputeBudgetInstruction::set_compute_unit_price(unit_price); @@ -239,7 +233,7 @@ pub async fn build_sell_instructions_with_jito( mint: &Pubkey, amount_token: Option, slippage_basis_points: Option, - jito_fee: Option, + priority_fee: PriorityFee, ) -> Result, anyhow::Error> { let (balance_u64, ata) = get_token_balance(rpc, payer, mint).await?; let amount = amount_token.unwrap_or(balance_u64); @@ -258,7 +252,11 @@ pub async fn build_sell_instructions_with_jito( slippage_basis_points.unwrap_or(DEFAULT_SLIPPAGE), ); - let mut instructions = vec![]; + let mut instructions = vec![ + ComputeBudgetInstruction::set_compute_unit_price(sol_to_lamports(priority_fee.price)), + ComputeBudgetInstruction::set_compute_unit_limit(sol_to_lamports(priority_fee.limit) as u32), + ]; + instructions.push(instruction::sell( payer, mint, @@ -278,7 +276,7 @@ pub async fn build_sell_instructions_with_jito( )?); let tip_account = jito_client.get_tip_account().await.map_err(|e| anyhow!(e))?; - let jito_fee = jito_fee.unwrap_or(JITO_TIP_AMOUNT); + let jito_fee = priority_fee.jito_fee.unwrap_or(JITO_TIP_AMOUNT); instructions.push( system_instruction::transfer( &payer.pubkey(),