Merge pull request #17 from SorellaLabs/feat/public-getters-baseline

feat: add public getters to BaselinePoolState and BaselineLiquidity

Author: Will-Smith11

crates/uni-v4-common/src/pools.rs

@@ -164,7 +164,7 @@ impl<T: V4Network> UniswapPools<T> {
                         continue;
                     };
 
-                    let baseline = pool.value_mut().get_baseline_liquidity_mut();
+                    let baseline = pool.value_mut().liquidity_mut();
 
                     // Merge new ticks with existing ones
                     baseline.initialized_ticks_mut().extend(ticks);

crates/uni-v4-structure/src/lib.rs

@@ -338,11 +338,11 @@ impl<T: V4Network> BaselinePoolState<T> {
         .swap()
     }
 
-    pub fn get_baseline_liquidity(&self) -> &BaselineLiquidity {
+    pub fn liquidity(&self) -> &BaselineLiquidity {
         &self.liquidity
     }
 
-    pub fn get_baseline_liquidity_mut(&mut self) -> &mut BaselineLiquidity {
+    pub fn liquidity_mut(&mut self) -> &mut BaselineLiquidity {
         &mut self.liquidity
     }
 }

crates/uni-v4-structure/src/liquidity_base.rs

@@ -320,14 +320,20 @@ impl BaselineLiquidity {
         self.initialized_ticks.keys().max().copied()
     }
 
-    /// Get the current tick
-    pub fn get_current_tick(&self) -> i32 {
+    pub fn tick_spacing(&self) -> i32 {
+        self.tick_spacing
+    }
+
+    pub fn start_tick(&self) -> i32 {
         self.start_tick
     }
 
-    /// Get the tick spacing
-    pub fn get_tick_spacing(&self) -> i32 {
-        self.tick_spacing
+    pub fn start_sqrt_price(&self) -> SqrtPriceX96 {
+        self.start_sqrt_price
+    }
+
+    pub fn start_liquidity(&self) -> u128 {
+        self.start_liquidity
     }
 }
 

crates/uni-v4-upkeeper/src/baseline_pool_factory.rs

@@ -743,10 +743,10 @@ where
         pool_state: &BaselinePoolState<T>,
         block_number: Option<u64>
     ) -> bool {
-        let baseline = pool_state.get_baseline_liquidity();
+        let baseline = pool_state.liquidity();
 
-        let current_tick = baseline.get_current_tick();
-        let tick_spacing = baseline.get_tick_spacing();
+        let current_tick = baseline.start_tick();
+        let tick_spacing = baseline.tick_spacing();
 
         // Get min and max initialized ticks
         let Some(min_tick) = baseline.get_min_initialized_tick() else {

crates/uni-v4/tests/l1_integration_test.rs

@@ -194,14 +194,14 @@ async fn test_pool_state_consistency() {
     for pool_id in &tracked_pool_ids {
         if let Some(pool_ref) = updated_pools.get_pools().get(pool_id) {
             let pool_state = pool_ref.value();
-            let baseline = pool_state.get_baseline_liquidity();
+            let baseline = pool_state.liquidity();
 
             // Capture complete state
             let snapshot = PoolStateSnapshot {
-                current_tick:      baseline.get_current_tick(),
+                current_tick:      baseline.start_tick(),
                 current_liquidity: pool_state.current_liquidity(),
                 sqrt_price:        pool_state.current_price(),
-                tick_spacing:      baseline.get_tick_spacing(),
+                tick_spacing:      baseline.tick_spacing(),
                 initialized_ticks: baseline.initialized_ticks().clone()
             };
 
@@ -248,18 +248,18 @@ async fn test_pool_state_consistency() {
         match (service1_state, fresh_pool_ref) {
             (Some(service1_snapshot), Some(fresh_ref)) => {
                 let fresh = fresh_ref.value();
-                let fresh_baseline = fresh.get_baseline_liquidity();
+                let fresh_baseline = fresh.liquidity();
 
                 // Compare basic state
                 let mut mismatches = Vec::new();
                 let mut subset_valid = true;
 
                 // Check basic metrics
-                if service1_snapshot.current_tick != fresh_baseline.get_current_tick() {
+                if service1_snapshot.current_tick != fresh_baseline.start_tick() {
                     mismatches.push(format!(
                         "current tick: {} vs {}",
                         service1_snapshot.current_tick,
-                        fresh_baseline.get_current_tick()
+                        fresh_baseline.start_tick()
                     ));
                 }
                 if service1_snapshot.current_liquidity != fresh.current_liquidity() {
@@ -276,11 +276,11 @@ async fn test_pool_state_consistency() {
                         fresh.current_price()
                     ));
                 }
-                if service1_snapshot.tick_spacing != fresh_baseline.get_tick_spacing() {
+                if service1_snapshot.tick_spacing != fresh_baseline.tick_spacing() {
                     mismatches.push(format!(
                         "tick spacing: {} vs {}",
                         service1_snapshot.tick_spacing,
-                        fresh_baseline.get_tick_spacing()
+                        fresh_baseline.tick_spacing()
                     ));
                 }
 

crates/uni-v4/tests/l2_integration_test.rs

@@ -194,14 +194,14 @@ async fn test_pool_state_consistency() {
     for pool_id in &tracked_pool_ids {
         if let Some(pool_ref) = updated_pools.get_pools().get(pool_id) {
             let pool_state = pool_ref.value();
-            let baseline = pool_state.get_baseline_liquidity();
+            let baseline = pool_state.liquidity();
 
             // Capture complete state
             let snapshot = PoolStateSnapshot {
-                current_tick:      baseline.get_current_tick(),
+                current_tick:      baseline.start_tick(),
                 current_liquidity: pool_state.current_liquidity(),
                 sqrt_price:        pool_state.current_price(),
-                tick_spacing:      baseline.get_tick_spacing(),
+                tick_spacing:      baseline.tick_spacing(),
                 initialized_ticks: baseline.initialized_ticks().clone()
             };
 
@@ -248,18 +248,18 @@ async fn test_pool_state_consistency() {
         match (service1_state, fresh_pool_ref) {
             (Some(service1_snapshot), Some(fresh_ref)) => {
                 let fresh = fresh_ref.value();
-                let fresh_baseline = fresh.get_baseline_liquidity();
+                let fresh_baseline = fresh.liquidity();
 
                 // Compare basic state
                 let mut mismatches = Vec::new();
                 let mut subset_valid = true;
 
                 // Check basic metrics
-                if service1_snapshot.current_tick != fresh_baseline.get_current_tick() {
+                if service1_snapshot.current_tick != fresh_baseline.start_tick() {
                     mismatches.push(format!(
                         "current tick: {} vs {}",
                         service1_snapshot.current_tick,
-                        fresh_baseline.get_current_tick()
+                        fresh_baseline.start_tick()
                     ));
                 }
                 if service1_snapshot.current_liquidity != fresh.current_liquidity() {
@@ -276,11 +276,11 @@ async fn test_pool_state_consistency() {
                         fresh.current_price()
                     ));
                 }
-                if service1_snapshot.tick_spacing != fresh_baseline.get_tick_spacing() {
+                if service1_snapshot.tick_spacing != fresh_baseline.tick_spacing() {
                     mismatches.push(format!(
                         "tick spacing: {} vs {}",
                         service1_snapshot.tick_spacing,
-                        fresh_baseline.get_tick_spacing()
+                        fresh_baseline.tick_spacing()
                     ));
                 }