refactor: rename

src/instruction/bonk.rs

@@ -66,19 +66,19 @@ impl BonkInstructionBuilder {
 
         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_before = protocol_params.real_base_before.unwrap_or(0);
+        let mut real_base = protocol_params.real_base.unwrap_or(0);
-        let mut real_quote_before = protocol_params.real_quote_before.unwrap_or(0);
+        let mut real_quote = protocol_params.real_quote.unwrap_or(0);
 
         if virtual_base == 0
             || virtual_quote == 0
-            || real_base_before == 0
+            || real_base == 0
-            || real_quote_before == 0
+            || real_quote == 0
         {
             let pool = Pool::fetch(params.rpc.as_ref().unwrap(), &pool_state).await?;
             virtual_base = pool.virtual_base as u128;
             virtual_quote = pool.virtual_quote as u128;
-            real_base_before = pool.real_base as u128;
+            real_base = pool.real_base as u128;
-            real_quote_before = pool.real_quote as u128;
+            real_quote = pool.real_quote as u128;
         }
 
         let amount_in: u64 = params.sol_amount;
@@ -90,8 +90,8 @@ impl BonkInstructionBuilder {
             accounts::SHARE_FEE_RATE,
             virtual_base,
             virtual_quote,
-            real_base_before,
+            real_base,
-            real_quote_before,
+            real_quote,
             params.slippage_basis_points.unwrap_or(DEFAULT_SLIPPAGE) as u128,
         );
 

src/trading/bonk/common.rs

@@ -8,8 +8,8 @@ pub fn get_amount_out(
     share_fee_rate: u128,
     virtual_base: u128,
     virtual_quote: u128,
-    real_base_before: u128,
+    real_base: u128,
-    real_quote_before: u128,
+    real_quote: u128,
     slippage_basis_points: u128,
 ) -> u64 {
     let amount_in_u128 = amount_in as u128;
@@ -23,8 +23,8 @@ pub fn get_amount_out(
         .unwrap()
         .checked_sub(share_fee)
         .unwrap();
-    let input_reserve = virtual_quote.checked_add(real_quote_before).unwrap();
+    let input_reserve = virtual_quote.checked_add(real_quote).unwrap();
-    let output_reserve = virtual_base.checked_sub(real_base_before).unwrap();
+    let output_reserve = virtual_base.checked_sub(real_base).unwrap();
     let numerator = amount_in_net.checked_mul(output_reserve).unwrap();
     let denominator = input_reserve.checked_add(amount_in_net).unwrap();
     let mut amount_out = numerator.checked_div(denominator).unwrap();

src/trading/core/params.rs

@@ -126,8 +126,8 @@ impl ProtocolParams for PumpSwapParams {
 pub struct BonkParams {
     pub virtual_base: Option<u128>,
     pub virtual_quote: Option<u128>,
-    pub real_base_before: Option<u128>,
+    pub real_base: Option<u128>,
-    pub real_quote_before: Option<u128>,
+    pub real_quote: Option<u128>,
     pub auto_handle_wsol: bool,
 }
 
@@ -136,8 +136,8 @@ impl BonkParams {
         Self {
             virtual_base: None,
             virtual_quote: None,
-            real_base_before: None,
+            real_base: None,
-            real_quote_before: None,
+            real_quote: None,
             auto_handle_wsol: true,
         }
     }