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

fix pump upgrade

Browse Source
This commit is contained in:
William
2025-05-13 06:34:57 +08:00
parent ee0f18a279
commit 3a60969b22
6 changed files with 143 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/instruction/mod.rs
+10 -172
View File
@@ -9,15 +9,6 @@
//! - `create`: Instruction to create a new token with an associated bonding curve.
//! - `buy`: Instruction to buy tokens from a bonding curve by providing SOL.
//! - `sell`: Instruction to sell tokens back to the bonding curve in exchange for SOL.
use std::sync::Arc;
use spl_associated_token_account::instruction::create_associated_token_account;
use spl_token::instruction::close_account;
use crate::common::SolanaRpcClient;
use crate::constants::trade::DEFAULT_SLIPPAGE;
use crate::ipfs::TokenMetadataIPFS;
use crate::pumpfun::common::{calculate_with_slippage_buy, calculate_with_slippage_sell, get_bonding_curve_account, get_buy_amount_with_slippage, get_global_account, get_initial_buy_price, get_token_balance, get_token_balance_and_ata};
use crate::{
constants,
pumpfun::common::{
@@ -33,7 +24,6 @@ use solana_sdk::{
signer::Signer,
};
use anyhow::{anyhow, Result};
pub struct Create {
pub _name: String,
pub _symbol: String,
@@ -156,24 +146,25 @@ pub fn create(payer: &Keypair, mint: &Keypair, args: Create) -> Instruction {
pub fn buy(
payer: &Keypair,
mint: &Pubkey,
bonding_curve: &Pubkey,
creator_vault: &Pubkey,
fee_recipient: &Pubkey,
args: Buy,
) -> Instruction {
let bonding_curve: Pubkey = get_bonding_curve_pda(mint).unwrap();
Instruction::new_with_bytes(
constants::accounts::PUMPFUN,
&args.data(),
vec![
AccountMeta::new_readonly(get_global_pda(), false),
AccountMeta::new_readonly(constants::global_constants::GLOBAL_ACCOUNT, false),
AccountMeta::new(*fee_recipient, false),
AccountMeta::new_readonly(*mint, false),
AccountMeta::new(bonding_curve, false),
AccountMeta::new(get_associated_token_address(&bonding_curve, mint), false),
AccountMeta::new(*bonding_curve, false),
AccountMeta::new(get_associated_token_address(bonding_curve, mint), false),
AccountMeta::new(get_associated_token_address(&payer.pubkey(), mint), false),
AccountMeta::new(payer.pubkey(), true),
AccountMeta::new_readonly(constants::accounts::SYSTEM_PROGRAM, false),
AccountMeta::new_readonly(constants::accounts::TOKEN_PROGRAM, false),
AccountMeta::new_readonly(constants::accounts::RENT, false),
AccountMeta::new(*creator_vault, false),
AccountMeta::new_readonly(constants::accounts::EVENT_AUTHORITY, false),
AccountMeta::new_readonly(constants::accounts::PUMPFUN, false),
],
@@ -199,15 +190,16 @@ pub fn buy(
pub fn sell(
payer: &Keypair,
mint: &Pubkey,
bonding_curve: &Pubkey,
creator_vault: &Pubkey,
fee_recipient: &Pubkey,
args: Sell,
) -> Instruction {
let bonding_curve: Pubkey = get_bonding_curve_pda(mint).unwrap();
Instruction::new_with_bytes(
constants::accounts::PUMPFUN,
&args.data(),
vec![
AccountMeta::new_readonly(get_global_pda(), false),
AccountMeta::new_readonly(constants::global_constants::GLOBAL_ACCOUNT, false),
AccountMeta::new(*fee_recipient, false),
AccountMeta::new_readonly(*mint, false),
AccountMeta::new(bonding_curve, false),
@@ -215,7 +207,7 @@ pub fn sell(
AccountMeta::new(get_associated_token_address(&payer.pubkey(), mint), false),
AccountMeta::new(payer.pubkey(), true),
AccountMeta::new_readonly(constants::accounts::SYSTEM_PROGRAM, false),
AccountMeta::new_readonly(constants::accounts::ASSOCIATED_TOKEN_PROGRAM, false),
AccountMeta::new(*creator_vault, false),
AccountMeta::new_readonly(constants::accounts::TOKEN_PROGRAM, false),
AccountMeta::new_readonly(constants::accounts::EVENT_AUTHORITY, false),
AccountMeta::new_readonly(constants::accounts::PUMPFUN, false),
@@ -223,157 +215,3 @@ pub fn sell(
)
}
pub async fn build_create_and_buy_instructions(
rpc: Arc<SolanaRpcClient>,
payer: Arc<Keypair>,
mint: Arc<Keypair>,
ipfs: TokenMetadataIPFS,
amount_sol: u64,
slippage_basis_points: Option<u64>,
) -> Result<Vec<Instruction>, anyhow::Error> {
if amount_sol == 0 {
return Err(anyhow!("build_create_and_buy_instructions: Amount cannot be zero"));
}
let rpc = rpc.as_ref();
let global_account = get_global_account(&rpc).await?;
let buy_amount = global_account.get_initial_buy_price(amount_sol);
let buy_amount_with_slippage =
get_buy_amount_with_slippage(amount_sol, slippage_basis_points);
let mut instructions = vec![];
instructions.push(create(
payer.as_ref(),
mint.as_ref(),
Create {
_name: ipfs.metadata.name.clone(),
_symbol: ipfs.metadata.symbol.clone(),
_uri: ipfs.metadata_uri.clone(),
_creator: payer.pubkey(),
},
));
let ata = get_associated_token_address(&payer.pubkey(), &mint.pubkey());
instructions.push(create_associated_token_account(
&payer.pubkey(),
&payer.pubkey(),
&mint.pubkey(),
&constants::accounts::TOKEN_PROGRAM,
));
instructions.push(buy(
payer.as_ref(),
&mint.pubkey(),
&global_account.fee_recipient,
Buy {
_amount: buy_amount,
_max_sol_cost: buy_amount_with_slippage,
},
));
Ok(instructions)
}
pub async fn build_buy_instructions(
rpc: Arc<SolanaRpcClient>,
payer: Arc<Keypair>,
mint: Arc<Pubkey>,
amount_sol: u64,
slippage_basis_points: Option<u64>,
) -> Result<Vec<Instruction>, anyhow::Error> {
if amount_sol == 0 {
return Err(anyhow!("build_buy_instructions:Amount cannot be zero"));
}
let global_account = get_global_account(&rpc).await?;
let buy_amount = match get_bonding_curve_account(&rpc, mint.as_ref()).await {
Ok(account) => {
account.get_buy_price(amount_sol).map_err(|e| anyhow!(e))?
},
Err(_e) => {
let initial_buy_amount = get_initial_buy_price(&global_account, amount_sol).await?;
initial_buy_amount * 80 / 100
}
};
let buy_amount_with_slippage = calculate_with_slippage_buy(amount_sol, slippage_basis_points.unwrap_or(DEFAULT_SLIPPAGE));
let mut instructions = vec![];
// let ata = get_associated_token_address(&payer.pubkey(), &mint);
// match rpc.get_account(&ata).await {
// Ok(_) => {},
// Err(_) => {
// instructions.push(create_associated_token_account(
// &payer.pubkey(),
// &payer.pubkey(),
// &mint,
// &constants::accounts::TOKEN_PROGRAM,
// ));
// }
// }
instructions.push(create_associated_token_account(
&payer.pubkey(),
&payer.pubkey(),
&mint,
&constants::accounts::TOKEN_PROGRAM,
));
instructions.push(buy(
payer.as_ref(),
&mint,
&global_account.fee_recipient,
Buy {
_amount: buy_amount,
_max_sol_cost: buy_amount_with_slippage,
},
));
Ok(instructions)
}
pub async fn build_sell_instructions(
rpc: Arc<SolanaRpcClient>,
payer: Arc<Keypair>,
mint: Arc<Pubkey>,
amount_token: u64,
slippage_basis_points: Option<u64>,
) -> Result<Vec<Instruction>, anyhow::Error> {
if amount_token == 0 {
return Err(anyhow!("build_sell_instructions: Amount cannot be zero"));
}
let ata = get_associated_token_address(&payer.pubkey(), mint.as_ref());
let global_account = get_global_account(&rpc).await?;
let bonding_curve_account = get_bonding_curve_account(&rpc, mint.as_ref()).await?;
let min_sol_output = bonding_curve_account
.get_sell_price(amount_token, global_account.fee_basis_points)
.map_err(|e| anyhow!(e))?;
let min_sol_output_with_slippage = calculate_with_slippage_sell(
min_sol_output,
slippage_basis_points.unwrap_or(DEFAULT_SLIPPAGE),
);
let mut instructions = vec![];
instructions.push(sell(
payer.as_ref(),
&mint,
&global_account.fee_recipient,
Sell {
_amount: amount_token,
_min_sol_output: min_sol_output_with_slippage,
},
));
instructions.push(close_account(
&spl_token::ID,
&ata,
&payer.pubkey(),
&payer.pubkey(),
&[&payer.pubkey()],
)?);
Ok(instructions)
}