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

feat: Astralane QUIC, code review fixes, README & example updates

Browse Source 
- Add Astralane QUIC client (astralane_quic.rs) and SwqosTransport::Quic
- README: Astralane QUIC usage, remove third-party doc links, add QUIC to examples
- Code review: API key not in logs, PumpSwap no clone, PDA Result, SELL_DISCRIMINATOR, ensure_wsol_ata refactor, tracing in astralane, only supports fix
- instruction/utils: pumpfun/pumpswap PDA & discriminator unit tests
- trading_client example: SwqosTransport, Astralane QUIC in config
- cli_trading: fix all unused variable warnings (_prefix)
- Add docs/CODE_REVIEW_REPORT.md

Made-with: Cursor
This commit is contained in:
Wood
2026-03-07 10:47:31 +08:00
parent fd5af3ab61
commit a003fd4d2f
14 changed files with 778 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/instruction/pumpfun.rs
+14 -10
View File
@@ -10,7 +10,7 @@ use crate::{
instruction::utils::pumpfun::{
accounts, get_bonding_curve_pda, get_bonding_curve_v2_pda, get_creator,
get_mayhem_fee_recipient_meta_random, get_user_volume_accumulator_pda,
global_constants::{self}, BUY_DISCRIMINATOR, BUY_EXACT_SOL_IN_DISCRIMINATOR,
global_constants::{self}, BUY_DISCRIMINATOR, BUY_EXACT_SOL_IN_DISCRIMINATOR, SELL_DISCRIMINATOR,
},
utils::calc::{
common::{calculate_with_slippage_buy, calculate_with_slippage_sell},
@@ -64,7 +64,8 @@ impl InstructionBuilder for PumpFunInstructionBuilder {
);
let bonding_curve_addr = if bonding_curve.account == Pubkey::default() {
get_bonding_curve_pda(&params.output_mint).unwrap()
get_bonding_curve_pda(&params.output_mint)
.ok_or_else(|| anyhow!("bonding_curve PDA derivation failed for mint {}", params.output_mint))?
} else {
bonding_curve.account
};
@@ -97,8 +98,8 @@ impl InstructionBuilder for PumpFunInstructionBuilder {
params.open_seed_optimize,
);
let user_volume_accumulator =
get_user_volume_accumulator_pda(&params.payer.pubkey()).unwrap();
let user_volume_accumulator = get_user_volume_accumulator_pda(&params.payer.pubkey())
.ok_or_else(|| anyhow!("user_volume_accumulator PDA derivation failed"))?;
// ========================================
// Build instructions
@@ -146,7 +147,8 @@ impl InstructionBuilder for PumpFunInstructionBuilder {
global_constants::FEE_RECIPIENT_META
};
let bonding_curve_v2 = get_bonding_curve_v2_pda(&params.output_mint).unwrap();
let bonding_curve_v2 = get_bonding_curve_v2_pda(&params.output_mint)
.ok_or_else(|| anyhow!("bonding_curve_v2 PDA derivation failed for mint {}", params.output_mint))?;
let mut accounts: Vec<AccountMeta> = vec![
global_constants::GLOBAL_ACCOUNT_META,
fee_recipient_meta,
@@ -218,7 +220,8 @@ impl InstructionBuilder for PumpFunInstructionBuilder {
};
let bonding_curve_addr = if bonding_curve.account == Pubkey::default() {
get_bonding_curve_pda(&params.input_mint).unwrap()
get_bonding_curve_pda(&params.input_mint)
.ok_or_else(|| anyhow!("bonding_curve PDA derivation failed for mint {}", params.input_mint))?
} else {
bonding_curve.account
};
@@ -257,7 +260,7 @@ impl InstructionBuilder for PumpFunInstructionBuilder {
let mut instructions = Vec::with_capacity(2);
let mut sell_data = [0u8; 24];
sell_data[..8].copy_from_slice(&[51, 230, 133, 164, 1, 127, 131, 173]); // Method ID
sell_data[..8].copy_from_slice(&SELL_DISCRIMINATOR);
sell_data[8..16].copy_from_slice(&token_amount.to_le_bytes());
sell_data[16..24].copy_from_slice(&min_sol_output.to_le_bytes());
@@ -287,12 +290,13 @@ impl InstructionBuilder for PumpFunInstructionBuilder {
// Cashback: Bonding Curve Sell expects UserVolumeAccumulator PDA at 0th remaining account (writable)
if bonding_curve.is_cashback_coin {
let user_volume_accumulator =
get_user_volume_accumulator_pda(&params.payer.pubkey()).unwrap();
let user_volume_accumulator = get_user_volume_accumulator_pda(&params.payer.pubkey())
.ok_or_else(|| anyhow!("user_volume_accumulator PDA derivation failed"))?;
accounts.push(AccountMeta::new(user_volume_accumulator, false));
}
// remainingAccounts: @pump-fun/pump-sdk sell 要求末尾传 bondingCurveV2Pda(mint)（cashback 时在 user_volume_accumulator 之后），勿删
let bonding_curve_v2 = get_bonding_curve_v2_pda(&params.input_mint).unwrap();
let bonding_curve_v2 = get_bonding_curve_v2_pda(&params.input_mint)
.ok_or_else(|| anyhow!("bonding_curve_v2 PDA derivation failed for mint {}", params.input_mint))?;
accounts.push(AccountMeta::new_readonly(bonding_curve_v2, false));
instructions.push(Instruction::new_with_bytes(
src/instruction/pumpswap.rs
+18 -26
View File
@@ -180,10 +180,9 @@ impl InstructionBuilder for PumpSwapInstructionBuilder {
]);
if quote_is_wsol_or_usdc {
accounts.push(accounts::GLOBAL_VOLUME_ACCUMULATOR_META);
accounts.push(AccountMeta::new(
get_user_volume_accumulator_pda(&params.payer.pubkey()).unwrap(),
false,
));
let uva = get_user_volume_accumulator_pda(&params.payer.pubkey())
.ok_or_else(|| anyhow!("user_volume_accumulator PDA derivation failed"))?;
accounts.push(AccountMeta::new(uva, false));
}
accounts.push(accounts::FEE_CONFIG_META);
accounts.push(accounts::FEE_PROGRAM_META);
@@ -194,10 +193,9 @@ impl InstructionBuilder for PumpSwapInstructionBuilder {
}
}
// remainingAccounts: @pump-fun/pump-swap-sdk 要求末尾传 poolV2Pda(baseMint)，勿删
accounts.push(AccountMeta::new_readonly(
get_pool_v2_pda(&base_mint).unwrap(),
false,
));
let pool_v2 = get_pool_v2_pda(&base_mint)
.ok_or_else(|| anyhow!("pool_v2 PDA derivation failed for base_mint {}", base_mint))?;
accounts.push(AccountMeta::new_readonly(pool_v2, false));
// Create instruction data（buy/buy_exact_quote_in 第三参数 track_volume: OptionBool，仅代币支持返现时传 Some(true)；sell 仅两参数）
let track_volume = if protocol_params.is_cashback_coin { [1u8, 1u8] } else { [1u8, 0u8] }; // Some(true) / Some(false)
@@ -227,13 +225,11 @@ impl InstructionBuilder for PumpSwapInstructionBuilder {
buf.to_vec()
};
let buy_instruction = Instruction {
instructions.push(Instruction {
program_id: accounts::AMM_PROGRAM,
accounts: accounts.clone(),
accounts,
data,
};
instructions.push(buy_instruction);
});
if close_wsol_ata {
// Close wSOL ATA account, reclaim rent
instructions.extend(crate::trading::common::close_wsol(&params.payer.pubkey()));
@@ -381,10 +377,9 @@ impl InstructionBuilder for PumpSwapInstructionBuilder {
]);
if !quote_is_wsol_or_usdc {
accounts.push(accounts::GLOBAL_VOLUME_ACCUMULATOR_META);
accounts.push(AccountMeta::new(
get_user_volume_accumulator_pda(&params.payer.pubkey()).unwrap(),
false,
));
let uva = get_user_volume_accumulator_pda(&params.payer.pubkey())
.ok_or_else(|| anyhow!("user_volume_accumulator PDA derivation failed"))?;
accounts.push(AccountMeta::new(uva, false));
}
accounts.push(accounts::FEE_CONFIG_META);
accounts.push(accounts::FEE_PROGRAM_META);
@@ -403,10 +398,9 @@ impl InstructionBuilder for PumpSwapInstructionBuilder {
}
}
// remainingAccounts: @pump-fun/pump-swap-sdk sell 要求末尾传 poolV2Pda(baseMint)，勿删
accounts.push(AccountMeta::new_readonly(
get_pool_v2_pda(&base_mint).unwrap(),
false,
));
let pool_v2 = get_pool_v2_pda(&base_mint)
.ok_or_else(|| anyhow!("pool_v2 PDA derivation failed for base_mint {}", base_mint))?;
accounts.push(AccountMeta::new_readonly(pool_v2, false));
// Create instruction data
let mut data = [0u8; 24];
@@ -424,13 +418,11 @@ impl InstructionBuilder for PumpSwapInstructionBuilder {
data[16..24].copy_from_slice(&token_amount.to_le_bytes());
}
let sell_instruction = Instruction {
instructions.push(Instruction {
program_id: accounts::AMM_PROGRAM,
accounts: accounts.clone(),
accounts,
data: data.to_vec(),
};
instructions.push(sell_instruction);
});
if close_wsol_ata {
instructions.extend(crate::trading::common::close_wsol(&params.payer.pubkey()));
src/instruction/utils/pumpfun.rs
+32 -4
View File
@@ -226,10 +226,9 @@ pub fn get_creator(creator_vault_pda: &Pubkey) -> Pubkey {
// Fast check against cached default creator vault
static DEFAULT_CREATOR_VAULT: std::sync::LazyLock<Option<Pubkey>> =
std::sync::LazyLock::new(|| get_creator_vault_pda(&Pubkey::default()));
if creator_vault_pda.eq(&DEFAULT_CREATOR_VAULT.unwrap()) {
Pubkey::default()
} else {
*creator_vault_pda
match DEFAULT_CREATOR_VAULT.as_ref() {
Some(default) if creator_vault_pda.eq(default) => Pubkey::default(),
_ => *creator_vault_pda,
}
}
}
@@ -299,3 +298,32 @@ pub fn get_buy_price(
s_u64.min(real_token_reserves)
}
#[cfg(test)]
mod tests {
use super::*;
use solana_sdk::pubkey::Pubkey;
#[test]
fn pumpfun_discriminators_are_8_bytes() {
assert_eq!(BUY_DISCRIMINATOR.len(), 8);
assert_eq!(BUY_EXACT_SOL_IN_DISCRIMINATOR.len(), 8);
assert_eq!(SELL_DISCRIMINATOR.len(), 8);
}
#[test]
fn pumpfun_bonding_curve_and_v2_pda_differ_for_same_mint() {
let mint = Pubkey::new_unique();
let pda = get_bonding_curve_pda(&mint).unwrap();
let pda_v2 = get_bonding_curve_v2_pda(&mint).unwrap();
assert_ne!(pda, pda_v2, "bonding_curve and bonding_curve_v2 PDAs must differ");
}
#[test]
fn pumpfun_creator_vault_pda_deterministic() {
let creator = Pubkey::new_unique();
let a = get_creator_vault_pda(&creator).unwrap();
let b = get_creator_vault_pda(&creator).unwrap();
assert_eq!(a, b);
}
}
src/instruction/utils/pumpswap.rs
+30 -2
View File
@@ -255,7 +255,7 @@ pub fn get_user_volume_accumulator_pda(user: &Pubkey) -> Option<Pubkey> {
crate::common::fast_fn::PdaCacheKey::PumpSwapUserVolume(*user),
|| {
let seeds: &[&[u8]; 2] = &[&seeds::USER_VOLUME_ACCUMULATOR_SEED, user.as_ref()];
let program_id: &Pubkey = &&accounts::AMM_PROGRAM;
let program_id: &Pubkey = &accounts::AMM_PROGRAM;
let pda: Option<(Pubkey, u8)> = Pubkey::try_find_program_address(seeds, program_id);
pda.map(|pubkey| pubkey.0)
},
@@ -288,7 +288,7 @@ pub fn get_user_volume_accumulator_quote_ata(
pub fn get_global_volume_accumulator_pda() -> Option<Pubkey> {
let seeds: &[&[u8]; 1] = &[&seeds::GLOBAL_VOLUME_ACCUMULATOR_SEED];
let program_id: &Pubkey = &&accounts::AMM_PROGRAM;
let program_id: &Pubkey = &accounts::AMM_PROGRAM;
let pda: Option<(Pubkey, u8)> = Pubkey::try_find_program_address(seeds, program_id);
pda.map(|pubkey| pubkey.0)
}
@@ -477,3 +477,31 @@ pub fn get_fee_config_pda() -> Option<Pubkey> {
let pda: Option<(Pubkey, u8)> = Pubkey::try_find_program_address(seeds, program_id);
pda.map(|pubkey| pubkey.0)
}
#[cfg(test)]
mod tests {
use super::*;
use solana_sdk::pubkey::Pubkey;
#[test]
fn pumpswap_user_volume_accumulator_pda_deterministic() {
let user = Pubkey::new_unique();
let a = get_user_volume_accumulator_pda(&user).unwrap();
let b = get_user_volume_accumulator_pda(&user).unwrap();
assert_eq!(a, b);
}
#[test]
fn pumpswap_global_volume_accumulator_matches_constant() {
let pda = get_global_volume_accumulator_pda().unwrap();
assert_eq!(pda, accounts::GLOBAL_VOLUME_ACCUMULATOR);
}
#[test]
fn pumpswap_pool_v2_pda_deterministic() {
let base_mint = Pubkey::new_unique();
let a = get_pool_v2_pda(&base_mint).unwrap();
let b = get_pool_v2_pda(&base_mint).unwrap();
assert_eq!(a, b);
}
}