Rollback

src/instruction/bonk.rs

@@ -7,7 +7,7 @@ use crate::{
     trading::{
         common::utils::get_token_balance,
         core::{
-            params::{BonkParams, InternalBuyParams, InternalSellParams},
+            params::{BonkParams, BuyParams, SellParams},
             traits::InstructionBuilder,
         },
     },
@@ -27,7 +27,7 @@ pub struct BonkInstructionBuilder;
 
 #[async_trait::async_trait]
 impl InstructionBuilder for BonkInstructionBuilder {
-    async fn build_buy_instructions(&self, params: &InternalBuyParams) -> Result<Vec<Instruction>> {
+    async fn build_buy_instructions(&self, params: &BuyParams) -> Result<Vec<Instruction>> {
         // ========================================
         // Parameter validation and basic data preparation
         // ========================================
@@ -144,7 +144,7 @@ impl InstructionBuilder for BonkInstructionBuilder {
         Ok(instructions)
     }
 
-    async fn build_sell_instructions(&self, params: &InternalSellParams) -> Result<Vec<Instruction>> {
+    async fn build_sell_instructions(&self, params: &SellParams) -> Result<Vec<Instruction>> {
         // ========================================
         // Parameter validation and basic data preparation
         // ========================================

src/instruction/pumpfun.rs

@@ -1,7 +1,7 @@
 use crate::{
     constants::trade::trade::DEFAULT_SLIPPAGE,
     trading::core::{
-        params::{InternalBuyParams, PumpFunParams, InternalSellParams},
+        params::{BuyParams, PumpFunParams, SellParams},
         traits::InstructionBuilder,
     },
 };
@@ -25,7 +25,7 @@ pub struct PumpFunInstructionBuilder;
 
 #[async_trait::async_trait]
 impl InstructionBuilder for PumpFunInstructionBuilder {
-    async fn build_buy_instructions(&self, params: &InternalBuyParams) -> Result<Vec<Instruction>> {
+    async fn build_buy_instructions(&self, params: &BuyParams) -> Result<Vec<Instruction>> {
         // ========================================
         // Parameter validation and basic data preparation
         // ========================================
@@ -138,7 +138,7 @@ impl InstructionBuilder for PumpFunInstructionBuilder {
         Ok(instructions)
     }
 
-    async fn build_sell_instructions(&self, params: &InternalSellParams) -> Result<Vec<Instruction>> {
+    async fn build_sell_instructions(&self, params: &SellParams) -> Result<Vec<Instruction>> {
         // ========================================
         // Parameter validation and basic data preparation
         // ========================================

src/instruction/pumpswap.rs

@@ -7,7 +7,7 @@ use crate::{
     trading::{
         common::wsol_manager,
         core::{
-            params::{InternalBuyParams, PumpSwapParams, InternalSellParams},
+            params::{BuyParams, PumpSwapParams, SellParams},
             traits::InstructionBuilder,
         },
     },
@@ -25,7 +25,7 @@ pub struct PumpSwapInstructionBuilder;
 
 #[async_trait::async_trait]
 impl InstructionBuilder for PumpSwapInstructionBuilder {
-    async fn build_buy_instructions(&self, params: &InternalBuyParams) -> Result<Vec<Instruction>> {
+    async fn build_buy_instructions(&self, params: &BuyParams) -> Result<Vec<Instruction>> {
         // ========================================
         // Parameter validation and basic data preparation
         // ========================================
@@ -197,7 +197,7 @@ impl InstructionBuilder for PumpSwapInstructionBuilder {
         Ok(instructions)
     }
 
-    async fn build_sell_instructions(&self, params: &InternalSellParams) -> Result<Vec<Instruction>> {
+    async fn build_sell_instructions(&self, params: &SellParams) -> Result<Vec<Instruction>> {
         // ========================================
         // Parameter validation and basic data preparation
         // ========================================

src/instruction/raydium_amm_v4.rs

@@ -2,7 +2,7 @@ use crate::{
     constants::trade::trade::DEFAULT_SLIPPAGE,
     instruction::utils::raydium_amm_v4::{accounts, SWAP_BASE_IN_DISCRIMINATOR},
     trading::core::{
-        params::{InternalBuyParams, RaydiumAmmV4Params, InternalSellParams},
+        params::{BuyParams, RaydiumAmmV4Params, SellParams},
         traits::InstructionBuilder,
     },
     utils::calc::raydium_amm_v4::compute_swap_amount,
@@ -18,7 +18,7 @@ pub struct RaydiumAmmV4InstructionBuilder;
 
 #[async_trait::async_trait]
 impl InstructionBuilder for RaydiumAmmV4InstructionBuilder {
-    async fn build_buy_instructions(&self, params: &InternalBuyParams) -> Result<Vec<Instruction>> {
+    async fn build_buy_instructions(&self, params: &BuyParams) -> Result<Vec<Instruction>> {
         // ========================================
         // Parameter validation and basic data preparation
         // ========================================
@@ -122,7 +122,7 @@ impl InstructionBuilder for RaydiumAmmV4InstructionBuilder {
         Ok(instructions)
     }
 
-    async fn build_sell_instructions(&self, params: &InternalSellParams) -> Result<Vec<Instruction>> {
+    async fn build_sell_instructions(&self, params: &SellParams) -> Result<Vec<Instruction>> {
         // ========================================
         // Parameter validation and basic data preparation
         // ========================================

src/instruction/raydium_cpmm.rs

@@ -6,7 +6,7 @@ use crate::{
         SWAP_BASE_IN_DISCRIMINATOR,
     },
     trading::core::{
-        params::{InternalBuyParams, RaydiumCpmmParams, InternalSellParams},
+        params::{BuyParams, RaydiumCpmmParams, SellParams},
         traits::InstructionBuilder,
     },
     utils::calc::raydium_cpmm::compute_swap_amount,
@@ -23,7 +23,7 @@ pub struct RaydiumCpmmInstructionBuilder;
 
 #[async_trait::async_trait]
 impl InstructionBuilder for RaydiumCpmmInstructionBuilder {
-    async fn build_buy_instructions(&self, params: &InternalBuyParams) -> Result<Vec<Instruction>> {
+    async fn build_buy_instructions(&self, params: &BuyParams) -> Result<Vec<Instruction>> {
         // ========================================
         // Parameter validation and basic data preparation
         // ========================================
@@ -153,7 +153,7 @@ impl InstructionBuilder for RaydiumCpmmInstructionBuilder {
         Ok(instructions)
     }
 
-    async fn build_sell_instructions(&self, params: &InternalSellParams) -> Result<Vec<Instruction>> {
+    async fn build_sell_instructions(&self, params: &SellParams) -> Result<Vec<Instruction>> {
         // ========================================
         // Parameter validation and basic data preparation
         // ========================================