added clippy suggestions

xdecentralix · xdecentralix · commit c86129c4609e · 2025-09-01T20:02:11.000+02:00
diff --git a/crates/driver/src/boundary/liquidity/balancer/v3/mod.rs b/crates/driver/src/boundary/liquidity/balancer/v3/mod.rs
@@ -134,7 +134,7 @@ async fn init_liquidity(
     block_retriever: Arc<dyn BlockRetrieving>,
     config: &infra::liquidity::config::BalancerV3,
 ) -> Result<impl LiquidityCollecting + use<>> {
-    let web3 = boundary::web3(eth);
+    let web3 = eth.web3().clone();
 
     // Create Balancer V3 contracts configuration
     let contracts = BalancerContracts {
diff --git a/crates/driver/src/boundary/liquidity/erc4626.rs b/crates/driver/src/boundary/liquidity/erc4626.rs
@@ -1,6 +1,6 @@
 use {
     crate::{
-        boundary::{self, Result},
+        boundary::Result,
         domain::{eth, liquidity},
         infra::blockchain::Ethereum,
     },
@@ -40,7 +40,7 @@ pub async fn maybe_collector(eth: &Ethereum) -> AnyResult<Vec<Box<dyn LiquidityC
     let config_dir = chain_to_config_dir(&chain);
     let primary_path = format!("configs/{}/erc4626.toml", config_dir);
     let fallback_path = format!("../{}", primary_path);
-    let web3 = boundary::web3(eth);
+    let web3 = eth.web3().clone();
     let settlement = eth.contracts().settlement().clone();
     let registry: Erc4626Registry = match shared::sources::erc4626::registry::registry_from_file(
         std::path::Path::new(&primary_path),
diff --git a/crates/driver/src/infra/solver/dto/auction.rs b/crates/driver/src/infra/solver/dto/auction.rs
@@ -356,46 +356,48 @@ pub fn new(
                         )
                     }
                     liquidity::Kind::BalancerV2GyroE(pool) => {
-                        solvers_dto::auction::Liquidity::GyroE(solvers_dto::auction::GyroEPool {
-                            id: liquidity.id.0.to_string(),
-                            address: pool.id.address().into(),
-                            balancer_pool_id: pool.id.into(),
-                            gas_estimate: liquidity.gas.into(),
-                            tokens: pool
-                                .reserves
-                                .iter()
-                                .map(|r| {
-                                    (
-                                        r.asset.token.into(),
-                                        solvers_dto::auction::GyroEReserve {
-                                            balance: r.asset.amount.into(),
-                                            scaling_factor: scaling_factor_to_decimal(r.scale),
-                                        },
-                                    )
-                                })
-                                .collect(),
-                            fee: fee_to_decimal(pool.fee),
-                            version: match pool.version {
-                                liquidity::balancer::v2::gyro_e::Version::V1 => {
-                                    solvers_dto::auction::GyroEVersion::V1
-                                }
+                        solvers_dto::auction::Liquidity::GyroE(Box::new(
+                            solvers_dto::auction::GyroEPool {
+                                id: liquidity.id.0.to_string(),
+                                address: pool.id.address().into(),
+                                balancer_pool_id: pool.id.into(),
+                                gas_estimate: liquidity.gas.into(),
+                                tokens: pool
+                                    .reserves
+                                    .iter()
+                                    .map(|r| {
+                                        (
+                                            r.asset.token.into(),
+                                            solvers_dto::auction::GyroEReserve {
+                                                balance: r.asset.amount.into(),
+                                                scaling_factor: scaling_factor_to_decimal(r.scale),
+                                            },
+                                        )
+                                    })
+                                    .collect(),
+                                fee: fee_to_decimal(pool.fee),
+                                version: match pool.version {
+                                    liquidity::balancer::v2::gyro_e::Version::V1 => {
+                                        solvers_dto::auction::GyroEVersion::V1
+                                    }
+                                },
+                                // Convert all Gyro E-CLP static parameters to BigDecimal
+                                params_alpha: signed_fixed_point_to_decimal(pool.params_alpha),
+                                params_beta: signed_fixed_point_to_decimal(pool.params_beta),
+                                params_c: signed_fixed_point_to_decimal(pool.params_c),
+                                params_s: signed_fixed_point_to_decimal(pool.params_s),
+                                params_lambda: signed_fixed_point_to_decimal(pool.params_lambda),
+                                tau_alpha_x: signed_fixed_point_to_decimal(pool.tau_alpha_x),
+                                tau_alpha_y: signed_fixed_point_to_decimal(pool.tau_alpha_y),
+                                tau_beta_x: signed_fixed_point_to_decimal(pool.tau_beta_x),
+                                tau_beta_y: signed_fixed_point_to_decimal(pool.tau_beta_y),
+                                u: signed_fixed_point_to_decimal(pool.u),
+                                v: signed_fixed_point_to_decimal(pool.v),
+                                w: signed_fixed_point_to_decimal(pool.w),
+                                z: signed_fixed_point_to_decimal(pool.z),
+                                d_sq: signed_fixed_point_to_decimal(pool.d_sq),
                             },
-                            // Convert all Gyro E-CLP static parameters to BigDecimal
-                            params_alpha: signed_fixed_point_to_decimal(pool.params_alpha),
-                            params_beta: signed_fixed_point_to_decimal(pool.params_beta),
-                            params_c: signed_fixed_point_to_decimal(pool.params_c),
-                            params_s: signed_fixed_point_to_decimal(pool.params_s),
-                            params_lambda: signed_fixed_point_to_decimal(pool.params_lambda),
-                            tau_alpha_x: signed_fixed_point_to_decimal(pool.tau_alpha_x),
-                            tau_alpha_y: signed_fixed_point_to_decimal(pool.tau_alpha_y),
-                            tau_beta_x: signed_fixed_point_to_decimal(pool.tau_beta_x),
-                            tau_beta_y: signed_fixed_point_to_decimal(pool.tau_beta_y),
-                            u: signed_fixed_point_to_decimal(pool.u),
-                            v: signed_fixed_point_to_decimal(pool.v),
-                            w: signed_fixed_point_to_decimal(pool.w),
-                            z: signed_fixed_point_to_decimal(pool.z),
-                            d_sq: signed_fixed_point_to_decimal(pool.d_sq),
-                        })
+                        ))
                     }
                     liquidity::Kind::BalancerV2Gyro2CLP(pool) => {
                         solvers_dto::auction::Liquidity::Gyro2CLP(
@@ -463,49 +465,53 @@ pub fn new(
                         )
                     }
                     liquidity::Kind::BalancerV3GyroE(pool) => {
-                        solvers_dto::auction::Liquidity::GyroE(solvers_dto::auction::GyroEPool {
-                            id: liquidity.id.0.to_string(),
-                            address: pool.id.address().into(),
-                            balancer_pool_id: {
-                                let pool_id_h160: eth::H160 = pool.id.into();
-                                pool_id_h160.into()
-                            },
-                            gas_estimate: liquidity.gas.into(),
-                            tokens: pool
-                                .reserves
-                                .iter()
-                                .map(|r| {
-                                    (
-                                        r.asset.token.into(),
-                                        solvers_dto::auction::GyroEReserve {
-                                            balance: r.asset.amount.into(),
-                                            scaling_factor: scaling_factor_to_decimal_v3(r.scale),
-                                        },
-                                    )
-                                })
-                                .collect(),
-                            fee: fee_to_decimal_v3(pool.fee),
-                            version: match pool.version {
-                                liquidity::balancer::v3::gyro_e::Version::V1 => {
-                                    solvers_dto::auction::GyroEVersion::V1
-                                }
+                        solvers_dto::auction::Liquidity::GyroE(Box::new(
+                            solvers_dto::auction::GyroEPool {
+                                id: liquidity.id.0.to_string(),
+                                address: pool.id.address().into(),
+                                balancer_pool_id: {
+                                    let pool_id_h160: eth::H160 = pool.id.into();
+                                    pool_id_h160.into()
+                                },
+                                gas_estimate: liquidity.gas.into(),
+                                tokens: pool
+                                    .reserves
+                                    .iter()
+                                    .map(|r| {
+                                        (
+                                            r.asset.token.into(),
+                                            solvers_dto::auction::GyroEReserve {
+                                                balance: r.asset.amount.into(),
+                                                scaling_factor: scaling_factor_to_decimal_v3(
+                                                    r.scale,
+                                                ),
+                                            },
+                                        )
+                                    })
+                                    .collect(),
+                                fee: fee_to_decimal_v3(pool.fee),
+                                version: match pool.version {
+                                    liquidity::balancer::v3::gyro_e::Version::V1 => {
+                                        solvers_dto::auction::GyroEVersion::V1
+                                    }
+                                },
+                                // Convert all Gyro E-CLP static parameters to BigDecimal
+                                params_alpha: signed_fixed_point_to_decimal_v3(pool.params_alpha),
+                                params_beta: signed_fixed_point_to_decimal_v3(pool.params_beta),
+                                params_c: signed_fixed_point_to_decimal_v3(pool.params_c),
+                                params_s: signed_fixed_point_to_decimal_v3(pool.params_s),
+                                params_lambda: signed_fixed_point_to_decimal_v3(pool.params_lambda),
+                                tau_alpha_x: signed_fixed_point_to_decimal_v3(pool.tau_alpha_x),
+                                tau_alpha_y: signed_fixed_point_to_decimal_v3(pool.tau_alpha_y),
+                                tau_beta_x: signed_fixed_point_to_decimal_v3(pool.tau_beta_x),
+                                tau_beta_y: signed_fixed_point_to_decimal_v3(pool.tau_beta_y),
+                                u: signed_fixed_point_to_decimal_v3(pool.u),
+                                v: signed_fixed_point_to_decimal_v3(pool.v),
+                                w: signed_fixed_point_to_decimal_v3(pool.w),
+                                z: signed_fixed_point_to_decimal_v3(pool.z),
+                                d_sq: signed_fixed_point_to_decimal_v3(pool.d_sq),
                             },
-                            // Convert all Gyro E-CLP static parameters to BigDecimal
-                            params_alpha: signed_fixed_point_to_decimal_v3(pool.params_alpha),
-                            params_beta: signed_fixed_point_to_decimal_v3(pool.params_beta),
-                            params_c: signed_fixed_point_to_decimal_v3(pool.params_c),
-                            params_s: signed_fixed_point_to_decimal_v3(pool.params_s),
-                            params_lambda: signed_fixed_point_to_decimal_v3(pool.params_lambda),
-                            tau_alpha_x: signed_fixed_point_to_decimal_v3(pool.tau_alpha_x),
-                            tau_alpha_y: signed_fixed_point_to_decimal_v3(pool.tau_alpha_y),
-                            tau_beta_x: signed_fixed_point_to_decimal_v3(pool.tau_beta_x),
-                            tau_beta_y: signed_fixed_point_to_decimal_v3(pool.tau_beta_y),
-                            u: signed_fixed_point_to_decimal_v3(pool.u),
-                            v: signed_fixed_point_to_decimal_v3(pool.v),
-                            w: signed_fixed_point_to_decimal_v3(pool.w),
-                            z: signed_fixed_point_to_decimal_v3(pool.z),
-                            d_sq: signed_fixed_point_to_decimal_v3(pool.d_sq),
-                        })
+                        ))
                     }
                     liquidity::Kind::BalancerV3Gyro2CLP(pool) => {
                         solvers_dto::auction::Liquidity::Gyro2CLP(
diff --git a/crates/shared/src/sources/balancer_v2/pools/gyro_2clp.rs b/crates/shared/src/sources/balancer_v2/pools/gyro_2clp.rs
@@ -101,11 +101,7 @@ fn pool_state(
 ) -> BoxFuture<'static, Result<Option<PoolState>>> {
     async move {
         let common = common.await;
-        let tokens = common
-            .tokens
-            .into_iter()
-            .map(|(address, common_state)| (address, common_state))
-            .collect();
+        let tokens = common.tokens.into_iter().collect();
 
         Ok(Some(PoolState {
             tokens,
diff --git a/crates/shared/src/sources/balancer_v2/pools/gyro_3clp.rs b/crates/shared/src/sources/balancer_v2/pools/gyro_3clp.rs
@@ -86,11 +86,7 @@ fn pool_state(
 ) -> BoxFuture<'static, Result<Option<PoolState>>> {
     async move {
         let common = common.await;
-        let tokens = common
-            .tokens
-            .into_iter()
-            .map(|(address, common_state)| (address, common_state))
-            .collect();
+        let tokens = common.tokens.into_iter().collect();
 
         Ok(Some(PoolState {
             tokens,
diff --git a/crates/shared/src/sources/balancer_v2/pools/gyro_e.rs b/crates/shared/src/sources/balancer_v2/pools/gyro_e.rs
@@ -176,11 +176,7 @@ fn pool_state(
 ) -> BoxFuture<'static, Result<Option<PoolState>>> {
     async move {
         let common = common.await;
-        let tokens = common
-            .tokens
-            .into_iter()
-            .map(|(address, common_state)| (address, common_state))
-            .collect();
+        let tokens = common.tokens.into_iter().collect();
 
         Ok(Some(PoolState {
             tokens,
diff --git a/crates/shared/src/sources/balancer_v2/swap/gyro_3clp_math.rs b/crates/shared/src/sources/balancer_v2/swap/gyro_3clp_math.rs
@@ -19,10 +19,6 @@ static WAD: LazyLock<BigInt> = LazyLock::new(|| BigInt::from(1_000_000_000_000_0
 // Official constants from Gyro3CLPMath.sol
 static MAX_BALANCES: LazyLock<BigInt> =
     LazyLock::new(|| BigInt::from(1_000_000_000_000_000_000_000_000_000_000_u128)); // 1e29
-static MIN_ROOT_3_ALPHA: LazyLock<BigInt> =
-    LazyLock::new(|| BigInt::from(158_740_105_196_819_970_u64)); // 0.15874010519681997e18
-static MAX_ROOT_3_ALPHA: LazyLock<BigInt> =
-    LazyLock::new(|| BigInt::from(999_966_665_555_493_800_u64)); // 0.9999666655554938e18
 static L_THRESHOLD_SIMPLE_NUMERICS: LazyLock<BigInt> =
     LazyLock::new(|| BigInt::from(20_000_000_000_000_000_000_000_000_000_000_u128)); // 2e31
 static L_MAX: LazyLock<BigInt> =
diff --git a/crates/shared/src/sources/balancer_v2/swap/gyro_e_math.rs b/crates/shared/src/sources/balancer_v2/swap/gyro_e_math.rs
@@ -38,10 +38,6 @@ const DERIVED_DSQ_NORM_ACCURACY_XP: u128 = 100_000_000_000_000_000_000_000; // 1
 const MAX_BALANCES: u128 = 100_000_000_000_000_000_000_000_000_000_000_000; // 1e34
 const MAX_INVARIANT: u128 = 3_000_000_000_000_000_000_000_000_000_000_000_000; // 3e37
 
-// Invariant ratio limits
-const MIN_INVARIANT_RATIO: u64 = 600_000_000_000_000_000; // 60e16 (60%)
-const MAX_INVARIANT_RATIO: u64 = 5_000_000_000_000_000_000; // 500e16 (500%)
-
 // Constants for sqrt function - precomputed square roots
 const SQRT_1E_NEG_1: u64 = 316227766016837933;
 const SQRT_1E_NEG_3: u64 = 31622776601683793;
diff --git a/crates/shared/src/sources/balancer_v3/swap/gyro_e_math.rs b/crates/shared/src/sources/balancer_v3/swap/gyro_e_math.rs
@@ -38,10 +38,6 @@ const DERIVED_DSQ_NORM_ACCURACY_XP: u128 = 100_000_000_000_000_000_000_000; // 1
 const MAX_BALANCES: u128 = 100_000_000_000_000_000_000_000_000_000_000_000; // 1e34
 const MAX_INVARIANT: u128 = 3_000_000_000_000_000_000_000_000_000_000_000_000; // 3e37
 
-// Invariant ratio limits
-const MIN_INVARIANT_RATIO: u64 = 600_000_000_000_000_000; // 60e16 (60%)
-const MAX_INVARIANT_RATIO: u64 = 5_000_000_000_000_000_000; // 500e16 (500%)
-
 // Constants for sqrt function - precomputed square roots
 const SQRT_1E_NEG_1: u64 = 316227766016837933;
 const SQRT_1E_NEG_3: u64 = 31622776601683793;
diff --git a/crates/shared/src/sources/balancer_v3/swap/reclamm_math.rs b/crates/shared/src/sources/balancer_v3/swap/reclamm_math.rs
@@ -176,7 +176,7 @@ fn compute_virtual_balances_updating_price_ratio(
         current_fourth_root_price_ratio.mul_down(current_fourth_root_price_ratio)?;
 
     // Determine which token is undervalued (rarer)
-    let (balance_undervalued, balance_overvalued, last_undervalued, last_overvalued) =
+    let (balance_undervalued, _balance_overvalued, last_undervalued, last_overvalued) =
         if is_pool_above_center {
             (
                 balances_scaled18[0],
@@ -244,17 +244,14 @@ fn compute_virtual_balances_updating_price_range(
         virtual_balance_b,
     )?)?;
 
-    let (mut v_undervalued, mut v_overvalued, b_undervalued, b_overvalued) = if is_pool_above_center
-    {
+    let (mut v_overvalued, b_undervalued, b_overvalued) = if is_pool_above_center {
         (
-            virtual_balance_a,
             virtual_balance_b,
             balances_scaled18[0],
             balances_scaled18[1],
         )
     } else {
         (
-            virtual_balance_b,
             virtual_balance_a,
             balances_scaled18[1],
             balances_scaled18[0],
@@ -277,7 +274,7 @@ fn compute_virtual_balances_updating_price_range(
         .sub(Bfp::one())?
         .mul_down(v_overvalued)?
         .sub(b_overvalued)?;
-    v_undervalued = Bfp::from_wei(
+    let v_undervalued = Bfp::from_wei(
         big_int_to_u256(&(va_num36 / u256_to_big_int(&va_den.as_uint256())))
             .map_err(|_| Error::MulOverflow)?,
     );
@@ -304,12 +301,7 @@ fn compute_price_range(
     virtual_balance_a: Bfp,
     virtual_balance_b: Bfp,
 ) -> Result<(Bfp, Bfp), Error> {
-    let invariant = compute_invariant(
-        balances_scaled18,
-        virtual_balance_a,
-        virtual_balance_b,
-        Rounding::Down,
-    )?;
+    let invariant = compute_invariant(balances_scaled18, virtual_balance_a, virtual_balance_b)?;
     // minPrice = Vb^2 / invariant (single-step integer division to match TS/Py)
     let vb_big: BigInt = u256_to_big_int(&virtual_balance_b.as_uint256());
     let inv_big: BigInt = u256_to_big_int(&invariant);
@@ -373,24 +365,14 @@ fn compute_centeredness(
     }
 }
 
-#[derive(Clone, Copy, Debug)]
-enum Rounding {
-    Down,
-    Up,
-}
-
 fn compute_invariant(
     balances_scaled18: &[Bfp; 2],
     virtual_balance_a: Bfp,
     virtual_balance_b: Bfp,
-    rounding: Rounding,
 ) -> Result<U256, Error> {
     let a = balances_scaled18[0].add(virtual_balance_a)?;
     let b = balances_scaled18[1].add(virtual_balance_b)?;
-    let prod = match rounding {
-        Rounding::Down => a.mul_down(b)?,
-        Rounding::Up => a.mul_up(b)?,
-    };
+    let prod = a.mul_down(b)?;
     Ok(prod.as_uint256())
 }
 
diff --git a/crates/solvers-dto/src/auction.rs b/crates/solvers-dto/src/auction.rs
@@ -166,7 +166,7 @@ pub enum Liquidity {
     WeightedProduct(WeightedProductPool),
     Stable(StablePool),
     ConcentratedLiquidity(ConcentratedLiquidityPool),
-    GyroE(GyroEPool),
+    GyroE(Box<GyroEPool>),
     Gyro2CLP(Gyro2CLPPool),
     Gyro3CLP(Gyro3CLPPool),
     ReClamm(ReClammPool),
diff --git a/crates/solvers/src/domain/solver.rs b/crates/solvers/src/domain/solver.rs
