feat: major refactor with calculation utilities and instruction optimization

- Add comprehensive calculation utilities for all protocols (bonk, pumpfun, pumpswap, raydium) - Refactor instruction modules to reduce code complexity and improve maintainability - Optimize trading parameters structure and enhance common utilities - Separate calculation logic from trading modules for better code organization - Update dependencies and module exports
2025-08-18 18:00:14 +08:00
parent 350e34e0a0
commit 57474bfa6e
21 changed files with 1513 additions and 1107 deletions
@@ -10,16 +10,19 @@ use crate::{
        trade::trade::DEFAULT_SLIPPAGE,
    },
    trading::{
-        bonk::common::{fetch_pool_state, get_amount_out, get_pool_pda, get_vault_pda},
+        bonk::common::{get_pool_pda, get_vault_pda},
        common::utils::get_token_balance,
        core::{
            params::{BonkParams, BuyParams, SellParams},
            traits::InstructionBuilder,
        },
    },
+    utils::calc::bonk::{
+        get_buy_token_amount_from_sol_amount, get_sell_sol_amount_from_token_amount,
+    },
 };

-/// Bonk协议的指令构建器
+/// Instruction builder for Bonk protocol
 pub struct BonkInstructionBuilder;

 #[async_trait::async_trait]
@@ -37,7 +40,7 @@ impl InstructionBuilder for BonkInstructionBuilder {
 }

 impl BonkInstructionBuilder {
-    /// 使用提供的账户信息构建买入指令
+    /// Build buy instructions with provided account information
    async fn build_buy_instructions_with_accounts(
        &self,
        params: &BuyParams,
@@ -50,7 +53,7 @@ impl BonkInstructionBuilder {

        let pool_state = get_pool_pda(&params.mint, &accounts::WSOL_TOKEN_ACCOUNT).unwrap();

-        // 创建用户代币账户
+        // Create user token accounts
        let user_base_token_account = spl_associated_token_account::get_associated_token_address(
            &params.payer.pubkey(),
            &params.mint,
@@ -60,31 +63,20 @@ impl BonkInstructionBuilder {
            &accounts::WSOL_TOKEN_ACCOUNT,
        );

-        // 获取池的代币账户
+        // Get pool token accounts
        let base_vault_account = get_vault_pda(&pool_state, &params.mint).unwrap();
        let quote_vault_account =
            get_vault_pda(&pool_state, &accounts::WSOL_TOKEN_ACCOUNT).unwrap();

-        let mut virtual_base = protocol_params.virtual_base.unwrap_or(0);
-        let mut virtual_quote = protocol_params.virtual_quote.unwrap_or(0);
-        let mut real_base = protocol_params.real_base.unwrap_or(0);
-        let mut real_quote = protocol_params.real_quote.unwrap_or(0);
-
-        if virtual_base == 0 || virtual_quote == 0 || real_base == 0 || real_quote == 0 {
-            let pool = fetch_pool_state(params.rpc.as_ref().unwrap(), &pool_state).await?;
-            virtual_base = pool.virtual_base as u128;
-            virtual_quote = pool.virtual_quote as u128;
-            real_base = pool.real_base as u128;
-            real_quote = pool.real_quote as u128;
-        }
+        let virtual_base = protocol_params.virtual_base;
+        let virtual_quote = protocol_params.virtual_quote;
+        let real_base = protocol_params.real_base;
+        let real_quote = protocol_params.real_quote;

        let amount_in: u64 = params.sol_amount;
        let share_fee_rate: u64 = 0;
-        let minimum_amount_out: u64 = get_amount_out(
+        let minimum_amount_out: u64 = get_buy_token_amount_from_sol_amount(
            amount_in,
-            accounts::PROTOCOL_FEE_RATE,
-            accounts::PLATFORM_FEE_RATE,
-            accounts::SHARE_FEE_RATE,
            virtual_base,
            virtual_quote,
            real_base,
@@ -95,9 +87,9 @@ impl BonkInstructionBuilder {
        let mut instructions = vec![];

        if protocol_params.auto_handle_wsol {
-            // 插入wsol
+            // Handle wSOL
            instructions.push(
-                // 创建wSOL ATA账户，如果不存在
+                // Create wSOL ATA account if it doesn't exist
                create_associated_token_account_idempotent(
                    &params.payer.pubkey(),
                    &params.payer.pubkey(),
@@ -106,11 +98,11 @@ impl BonkInstructionBuilder {
                ),
            );
            instructions.push(
-                // 将SOL转入wSOL ATA账户
+                // Transfer SOL to wSOL ATA account
                transfer(&params.payer.pubkey(), &user_quote_token_account, amount_in),
            );

-            // 同步wSOL余额
+            // Sync wSOL balance
            instructions.push(
                spl_token::instruction::sync_native(
                    &accounts::TOKEN_PROGRAM,
@@ -120,7 +112,7 @@ impl BonkInstructionBuilder {
            );
        }

-        // 创建用户的基础代币账户
+        // Create user's base token account
        instructions.push(create_associated_token_account_idempotent(
            &params.payer.pubkey(),
            &params.payer.pubkey(),
@@ -128,7 +120,7 @@ impl BonkInstructionBuilder {
            &accounts::TOKEN_PROGRAM,
        ));

-        // 创建买入指令
+        // Create buy instruction
        let accounts = vec![
            solana_sdk::instruction::AccountMeta::new(params.payer.pubkey(), true), // Payer (signer)
            solana_sdk::instruction::AccountMeta::new_readonly(accounts::AUTHORITY, false), // Authority (readonly)
@@ -141,12 +133,15 @@ impl BonkInstructionBuilder {
            solana_sdk::instruction::AccountMeta::new(quote_vault_account, false), // Quote Vault
            solana_sdk::instruction::AccountMeta::new_readonly(params.mint, false), // Base Token Mint (readonly)
            solana_sdk::instruction::AccountMeta::new_readonly(accounts::WSOL_TOKEN_ACCOUNT, false), // Quote Token Mint (readonly)
-            solana_sdk::instruction::AccountMeta::new_readonly(accounts::TOKEN_PROGRAM, false), // Base Token Program (readonly)
+            solana_sdk::instruction::AccountMeta::new_readonly(
+                protocol_params.mint_token_program,
+                false,
+            ), // Base Token Program (readonly)
            solana_sdk::instruction::AccountMeta::new_readonly(accounts::TOKEN_PROGRAM, false), // Quote Token Program (readonly)
            solana_sdk::instruction::AccountMeta::new_readonly(accounts::EVENT_AUTHORITY, false), // Event Authority (readonly)
            solana_sdk::instruction::AccountMeta::new_readonly(accounts::BONK, false), // Program (readonly)
        ];
-        // 创建指令数据
+        // Create instruction data
        let mut data = vec![];
        data.extend_from_slice(&BUY_EXECT_IN_DISCRIMINATOR);
        data.extend_from_slice(&amount_in.to_le_bytes());
@@ -156,7 +151,7 @@ impl BonkInstructionBuilder {
        instructions.push(Instruction { program_id: accounts::BONK, accounts, data });

        if protocol_params.auto_handle_wsol {
-            // 关闭wSOL ATA账户，回收租金
+            // Close wSOL ATA account, reclaim rent
            instructions.push(
                spl_token::instruction::close_account(
                    &accounts::TOKEN_PROGRAM,
@@ -172,7 +167,7 @@ impl BonkInstructionBuilder {
        Ok(instructions)
    }

-    /// 使用提供的账户信息构建卖出指令
+    /// Build sell instructions with provided account information
    async fn build_sell_instructions_with_accounts(
        &self,
        params: &SellParams,
@@ -180,9 +175,16 @@ impl BonkInstructionBuilder {
        if params.rpc.is_none() {
            return Err(anyhow!("RPC is not set"));
        }
+
+        let protocol_params = params
+            .protocol_params
+            .as_any()
+            .downcast_ref::<BonkParams>()
+            .ok_or_else(|| anyhow!("Invalid protocol params for Bonk"))?;
+
        let rpc = params.rpc.as_ref().unwrap().clone();

-        // 获取代币余额
+        // Get token balance
        let mut amount = params.token_amount;
        if params.token_amount.is_none() || params.token_amount.unwrap_or(0) == 0 {
            let balance_u64 =
@@ -195,12 +197,24 @@ impl BonkInstructionBuilder {
            return Err(anyhow!("Amount cannot be zero"));
        }

-        // 计算预期的SOL数量
-        let minimum_amount_out: u64 = 1;
-
        let pool_state = get_pool_pda(&params.mint, &accounts::WSOL_TOKEN_ACCOUNT).unwrap();

-        // 创建用户代币账户
+        let virtual_base = protocol_params.virtual_base;
+        let virtual_quote = protocol_params.virtual_quote;
+        let real_base = protocol_params.real_base;
+        let real_quote = protocol_params.real_quote;
+
+        // Calculate expected SOL amount
+        let minimum_amount_out: u64 = get_sell_sol_amount_from_token_amount(
+            amount,
+            virtual_base,
+            virtual_quote,
+            real_base,
+            real_quote,
+            params.slippage_basis_points.unwrap_or(DEFAULT_SLIPPAGE) as u128,
+        );
+
+        // Create user token accounts
        let user_base_token_account = spl_associated_token_account::get_associated_token_address(
            &params.payer.pubkey(),
            &params.mint,
@@ -210,7 +224,7 @@ impl BonkInstructionBuilder {
            &accounts::WSOL_TOKEN_ACCOUNT,
        );

-        // 获取池的代币账户
+        // Get pool token accounts
        let base_vault_account = get_vault_pda(&pool_state, &params.mint).unwrap();
        let quote_vault_account =
            get_vault_pda(&pool_state, &accounts::WSOL_TOKEN_ACCOUNT).unwrap();
@@ -219,9 +233,9 @@ impl BonkInstructionBuilder {

        let mut instructions = vec![];

-        // 插入wsol
+        // Handle wSOL
        instructions.push(
-            // 创建wSOL ATA账户，如果不存在
+            // Create wSOL ATA account if it doesn't exist
            create_associated_token_account_idempotent(
                &params.payer.pubkey(),
                &params.payer.pubkey(),
@@ -230,7 +244,7 @@ impl BonkInstructionBuilder {
            ),
        );

-        // 创建卖出指令
+        // Create sell instruction
        let accounts = vec![
            solana_sdk::instruction::AccountMeta::new(params.payer.pubkey(), true), // Payer (signer)
            solana_sdk::instruction::AccountMeta::new_readonly(accounts::AUTHORITY, false), // Authority (readonly)
@@ -243,13 +257,16 @@ impl BonkInstructionBuilder {
            solana_sdk::instruction::AccountMeta::new(quote_vault_account, false), // Quote Vault
            solana_sdk::instruction::AccountMeta::new_readonly(params.mint, false), // Base Token Mint (readonly)
            solana_sdk::instruction::AccountMeta::new_readonly(accounts::WSOL_TOKEN_ACCOUNT, false), // Quote Token Mint (readonly)
-            solana_sdk::instruction::AccountMeta::new_readonly(accounts::TOKEN_PROGRAM, false), // Base Token Program (readonly)
+            solana_sdk::instruction::AccountMeta::new_readonly(
+                protocol_params.mint_token_program,
+                false,
+            ), // Base Token Program (readonly)
            solana_sdk::instruction::AccountMeta::new_readonly(accounts::TOKEN_PROGRAM, false), // Quote Token Program (readonly)
            solana_sdk::instruction::AccountMeta::new_readonly(accounts::EVENT_AUTHORITY, false), // Event Authority (readonly)
            solana_sdk::instruction::AccountMeta::new_readonly(accounts::BONK, false), // Program (readonly)
        ];

-        // 创建指令数据
+        // Create instruction data
        let mut data = vec![];
        data.extend_from_slice(&SELL_EXECT_IN_DISCRIMINATOR);
        data.extend_from_slice(&amount.to_le_bytes());
@@ -258,12 +275,6 @@ impl BonkInstructionBuilder {

        instructions.push(Instruction { program_id: accounts::BONK, accounts, data });

-        let protocol_params = params
-            .protocol_params
-            .as_any()
-            .downcast_ref::<BonkParams>()
-            .ok_or_else(|| anyhow!("Invalid protocol params for Bonk"))?;
-
        if protocol_params.auto_handle_wsol {
            instructions.push(
                close_account(