add subassign and addassign

Author: moodysalem

src/quoting/base_pool.rs

@@ -6,7 +6,7 @@ use crate::quoting::util::{
     approximate_number_of_tick_spacings_crossed, construct_sorted_ticks, ConstructSortedTicksError,
 };
 use alloc::vec::Vec;
-use core::ops::{Add, AddAssign};
+use core::ops::{Add, AddAssign, Sub, SubAssign};
 use num_traits::Zero;
 
 // Resources consumed during any swap execution.
@@ -34,6 +34,23 @@ impl Add for BasePoolResources {
     }
 }
 
+impl SubAssign for BasePoolResources {
+    fn sub_assign(&mut self, rhs: Self) {
+        self.no_override_price_change -= rhs.no_override_price_change;
+        self.initialized_ticks_crossed -= rhs.initialized_ticks_crossed;
+        self.tick_spacings_crossed -= rhs.tick_spacings_crossed;
+    }
+}
+
+impl Sub for BasePoolResources {
+    type Output = Self;
+
+    fn sub(mut self, rhs: Self) -> Self::Output {
+        self -= rhs;
+        self
+    }
+}
+
 pub const FULL_RANGE_TICK_SPACING: u32 = 0;
 pub const MAX_TICK_SPACING: u32 = 698605;
 

src/quoting/full_range_pool.rs

@@ -2,7 +2,7 @@ use crate::math::swap::{compute_step, is_price_increasing, ComputeStepError};
 use crate::math::tick::{MAX_SQRT_RATIO, MIN_SQRT_RATIO};
 use crate::math::uint::U256;
 use crate::quoting::types::{NodeKey, Pool, Quote, QuoteParams};
-use core::ops::{Add, AddAssign};
+use core::ops::{Add, AddAssign, Sub, SubAssign};
 use num_traits::Zero;
 
 // Resources consumed during any swap execution in a full range pool.
@@ -26,6 +26,21 @@ impl Add for FullRangePoolResources {
     }
 }
 
+impl SubAssign for FullRangePoolResources {
+    fn sub_assign(&mut self, rhs: Self) {
+        self.no_override_price_change -= rhs.no_override_price_change;
+    }
+}
+
+impl Sub for FullRangePoolResources {
+    type Output = Self;
+
+    fn sub(mut self, rhs: Self) -> Self::Output {
+        self -= rhs;
+        self
+    }
+}
+
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub enum FullRangePoolQuoteError {
     InvalidToken,

src/quoting/mev_resist_pool.rs

@@ -2,7 +2,7 @@ use crate::math::swap::{amount_before_fee, compute_fee};
 use crate::math::tick::{approximate_sqrt_ratio_to_tick, FULL_RANGE_TICK_SPACING};
 use crate::quoting::base_pool::{BasePool, BasePoolQuoteError, BasePoolResources, BasePoolState};
 use crate::quoting::types::{BlockTimestamp, NodeKey, Pool, Quote, QuoteParams};
-use core::ops::{Add, AddAssign};
+use core::ops::{Add, AddAssign, Sub, SubAssign};
 
 // Resources consumed during any swap execution in a full range pool.
 #[derive(Clone, Copy, Default, Debug, PartialEq, Eq)]
@@ -27,6 +27,22 @@ impl Add for MEVResistPoolResources {
     }
 }
 
+impl SubAssign for MEVResistPoolResources {
+    fn sub_assign(&mut self, rhs: Self) {
+        self.state_update_count -= rhs.state_update_count;
+        self.base_pool_resources -= rhs.base_pool_resources;
+    }
+}
+
+impl Sub for MEVResistPoolResources {
+    type Output = Self;
+
+    fn sub(mut self, rhs: Self) -> Self::Output {
+        self -= rhs;
+        self
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct MEVResistPool {
@@ -142,7 +158,7 @@ impl Pool for MEVResistPool {
                     .map_or(self.last_update_time, |mrps| mrps.last_update_time);
 
                 // if the time is updated, fees are accumulated to the current liquidity providers
-                // this is at least 2 additional SSTOREs
+                // this causes up to 3 additional SSTOREs (~15k gas)
                 let state_update_count = if pool_time != current_time { 1 } else { 0 };
 
                 if fixed_point_additional_fee == 0 {
@@ -167,12 +183,10 @@ impl Pool for MEVResistPool {
 
                 if params.token_amount.amount >= 0 {
                     // exact input, remove the additional fee from the output
-                    calculated_amount -=
-                        compute_fee(calculated_amount as u128, fixed_point_additional_fee);
+                    calculated_amount -= compute_fee(calculated_amount, fixed_point_additional_fee);
                 } else {
-                    let input_amount_fee: u128 =
-                        compute_fee(calculated_amount as u128, pool_config.fee);
-                    let input_amount = (calculated_amount as u128) - input_amount_fee;
+                    let input_amount_fee: u128 = compute_fee(calculated_amount, pool_config.fee);
+                    let input_amount = calculated_amount - input_amount_fee;
 
                     if let Some(bf) = amount_before_fee(input_amount, fixed_point_additional_fee) {
                         let fee = bf - input_amount;

src/quoting/oracle_pool.rs

@@ -5,7 +5,7 @@ use crate::quoting::full_range_pool::{
     FullRangePool, FullRangePoolQuoteError, FullRangePoolResources, FullRangePoolState,
 };
 use crate::quoting::types::{BlockTimestamp, NodeKey, Pool, Quote, QuoteParams};
-use core::ops::Add;
+use core::ops::{Add, AddAssign, Sub, SubAssign};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct OraclePoolState {
@@ -19,15 +19,35 @@ pub struct OraclePoolResources {
     pub snapshots_written: u32,
 }
 
+impl AddAssign for OraclePoolResources {
+    fn add_assign(&mut self, rhs: Self) {
+        self.full_range_pool_resources += rhs.full_range_pool_resources;
+        self.snapshots_written += rhs.snapshots_written;
+    }
+}
+
 impl Add for OraclePoolResources {
     type Output = OraclePoolResources;
 
-    fn add(self, rhs: Self) -> Self::Output {
-        OraclePoolResources {
-            full_range_pool_resources: self.full_range_pool_resources
-                + rhs.full_range_pool_resources,
-            snapshots_written: self.snapshots_written + rhs.snapshots_written,
-        }
+    fn add(mut self, rhs: Self) -> Self::Output {
+        self += rhs;
+        self
+    }
+}
+
+impl SubAssign for OraclePoolResources {
+    fn sub_assign(&mut self, rhs: Self) {
+        self.full_range_pool_resources -= rhs.full_range_pool_resources;
+        self.snapshots_written -= rhs.snapshots_written;
+    }
+}
+
+impl Sub for OraclePoolResources {
+    type Output = Self;
+
+    fn sub(mut self, rhs: Self) -> Self::Output {
+        self -= rhs;
+        self
     }
 }
 

src/quoting/twamm_pool.rs

@@ -7,7 +7,7 @@ use crate::quoting::full_range_pool::{
 use crate::quoting::types::{BlockTimestamp, Config};
 use crate::quoting::types::{NodeKey, Pool, Quote, QuoteParams, TokenAmount};
 use alloc::vec::Vec;
-use core::ops::Add;
+use core::ops::{Add, AddAssign, Sub, SubAssign};
 use num_traits::{ToPrimitive, Zero};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -29,19 +29,39 @@ pub struct TwammPoolResources {
     pub virtual_orders_executed: u32,
 }
 
+impl AddAssign for TwammPoolResources {
+    fn add_assign(&mut self, rhs: Self) {
+        self.full_range_pool_resources += rhs.full_range_pool_resources;
+        self.virtual_order_delta_times_crossed += rhs.virtual_order_delta_times_crossed;
+        self.virtual_order_seconds_executed += rhs.virtual_order_seconds_executed;
+        self.virtual_orders_executed += rhs.virtual_orders_executed;
+    }
+}
+
 impl Add for TwammPoolResources {
     type Output = TwammPoolResources;
 
-    fn add(self, rhs: Self) -> Self::Output {
-        TwammPoolResources {
-            full_range_pool_resources: self.full_range_pool_resources
-                + rhs.full_range_pool_resources,
-            virtual_order_delta_times_crossed: self.virtual_order_delta_times_crossed
-                + rhs.virtual_order_delta_times_crossed,
-            virtual_order_seconds_executed: self.virtual_order_seconds_executed
-                + rhs.virtual_order_seconds_executed,
-            virtual_orders_executed: self.virtual_orders_executed + rhs.virtual_orders_executed,
-        }
+    fn add(mut self, rhs: Self) -> Self::Output {
+        self += rhs;
+        self
+    }
+}
+
+impl SubAssign for TwammPoolResources {
+    fn sub_assign(&mut self, rhs: Self) {
+        self.full_range_pool_resources -= rhs.full_range_pool_resources;
+        self.virtual_order_delta_times_crossed -= rhs.virtual_order_delta_times_crossed;
+        self.virtual_order_seconds_executed -= rhs.virtual_order_seconds_executed;
+        self.virtual_orders_executed -= rhs.virtual_orders_executed;
+    }
+}
+
+impl Sub for TwammPoolResources {
+    type Output = TwammPoolResources;
+
+    fn sub(mut self, rhs: Self) -> Self::Output {
+        self -= rhs;
+        self
     }
 }
 

src/quoting/types.rs

@@ -1,6 +1,6 @@
 use crate::math::uint::U256;
 use core::fmt::Debug;
-use core::ops::Add;
+use core::ops::{Add, Sub};
 
 // Unique key identifying the pool.
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
@@ -102,7 +102,7 @@ pub struct Quote<R, S> {
 pub type BlockTimestamp = u64;
 
 pub trait Pool: Send + Sync + Debug + Clone + PartialEq + Eq {
-    type Resources: Add + Debug + Default + Copy + PartialEq + Eq;
+    type Resources: Add + Sub + Debug + Default + Copy + PartialEq + Eq;
     type State: Debug + Copy + PartialEq + Eq;
     type QuoteError: Debug + Copy;
     // Any additional data that is required to compute a quote for this pool, e.g. the block timestamp