feat - use bindings instead of sol! macro

src/amm/camelot_v3/batch_request/mod.rs

@@ -12,32 +12,12 @@ use tracing::instrument;
 
 use crate::{
     amm::{AutomatedMarketMaker, AMM},
+    bindings,
     errors::AMMError,
 };
 
 use super::CamelotV3Pool;
 
-sol! {
-    #[allow(missing_docs)]
-    #[sol(rpc)]
-    IGetCamelotV3PoolDataBatchRequest,
-    "src/amm/camelot_v3/batch_request/GetCamelotV3PoolDataBatchRequestABI.json"
-}
-
-sol! {
-    #[allow(missing_docs)]
-    #[sol(rpc)]
-    IGetCamelotV3TickDataBatchRequest,
-    "src/amm/camelot_v3/batch_request/GetCamelotV3TickDataBatchRequestABI.json"
-}
-
-sol! {
-    #[allow(missing_docs)]
-    #[sol(rpc)]
-    ISyncCamelotV3PoolBatchRequest,
-    "src/amm/camelot_v3/batch_request/SyncCamelotV3PoolBatchRequestABI.json"
-}
-
 #[inline]
 fn populate_pool_data_from_tokens(
     mut pool: CamelotV3Pool,
@@ -66,7 +46,7 @@ where
     N: Network,
     P: Provider<T, N>,
 {
-    let deployer = IGetCamelotV3PoolDataBatchRequest::deploy_builder(provider, vec![pool.address]);
+    let deployer = bindings::getcamelotv3pooldatabatchrequest::GetCamelotV3PoolDataBatchRequest::deploy_builder(provider, vec![pool.address]);
     let res = if let Some(block_number) = block_number {
         deployer.block(block_number.into()).call_raw().await?
     } else {
@@ -120,7 +100,7 @@ where
     N: Network,
     P: Provider<T, N>,
 {
-    let deployer = IGetCamelotV3TickDataBatchRequest::deploy_builder(
+    let deployer = bindings::getcamelotv3tickdatabatchrequest::GetCamelotV3TickDataBatchRequest::deploy_builder(
         provider,
         pool.address,
         zero_for_one,
@@ -198,7 +178,11 @@ where
     N: Network,
     P: Provider<T, N>,
 {
-    let deployer = ISyncCamelotV3PoolBatchRequest::deploy_builder(provider, vec![pool.address]);
+    let deployer =
+        bindings::synccamelotv3poolbatchrequest::SyncCamelotV3PoolBatchRequest::deploy_builder(
+            provider,
+            vec![pool.address],
+        );
     let res = deployer.call_raw().await?;
 
     let constructor_return = DynSolType::Array(Box::new(DynSolType::Tuple(vec![
@@ -264,7 +248,11 @@ where
         target_addresses.push(amm.address());
     }
 
-    let deployer = IGetCamelotV3PoolDataBatchRequest::deploy_builder(provider, target_addresses);
+    let deployer =
+        bindings::getcamelotv3pooldatabatchrequest::GetCamelotV3PoolDataBatchRequest::deploy_builder(
+            provider,
+            target_addresses,
+        );
     let res = deployer.block(block_number.into()).call_raw().await?;
 
     let constructor_return = DynSolType::Array(Box::new(DynSolType::Tuple(vec![

src/amm/curve/batch_request/mod.rs

@@ -3,22 +3,14 @@ use alloy::{
     network::Network,
     primitives::{Address, U256},
     providers::Provider,
-    sol,
     transports::Transport,
 };
 use std::sync::Arc;
 
-use crate::errors::AMMError;
+use crate::{bindings, errors::AMMError};
 
 use super::CurvePool;
 
-sol! {
-    #[allow(missing_docs)]
-    #[sol(rpc)]
-    IGetCurvePoolDataBatchRequest,
-    "src/amm/curve/batch_request/GetCurvePoolDataBatchRequestABI.json"
-}
-
 #[derive(Debug)]
 struct PoolData {
     coins: [Address; 8],
@@ -76,7 +68,10 @@ where
     N: Network,
     P: Provider<T, N>,
 {
-    let deployer = IGetCurvePoolDataBatchRequest::deploy_builder(provider, vec![pool.address]);
+    let deployer = bindings::getcurvepoolbatchrequest::GetCurvePoolBatchRequest::deploy_builder(
+        provider,
+        vec![pool.address],
+    );
     let res = deployer.call_raw().await?;
 
     let constructor_return = DynSolType::Array(Box::new(DynSolType::Tuple(vec![

src/amm/erc_4626/batch_request/mod.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use crate::{amm::AutomatedMarketMaker, errors::AMMError};
+use crate::{amm::AutomatedMarketMaker, bindings, errors::AMMError};
 
 use alloy::{
     dyn_abi::{DynSolType, DynSolValue},
@@ -13,13 +13,6 @@ use alloy::{
 
 use super::ERC4626Vault;
 
-sol! {
-    #[allow(missing_docs)]
-    #[sol(rpc)]
-    IGetERC4626VaultDataBatchRequest,
-    "src/amm/erc_4626/batch_request/GetERC4626VaultDataBatchRequestABI.json"
-}
-
 #[inline]
 fn populate_pool_data_from_tokens(
     mut vault: ERC4626Vault,
@@ -77,7 +70,10 @@ where
     P: Provider<T, N>,
 {
     let deployer =
-        IGetERC4626VaultDataBatchRequest::deploy_builder(provider, vec![vault.vault_token]);
+        bindings::geterc4626vaultdatabatchrequest::GetERC4626VaultDataBatchRequest::deploy_builder(
+            provider,
+            vec![vault.vault_token],
+        );
     let res = deployer.call_raw().await?;
 
     let constructor_return = DynSolType::Array(Box::new(DynSolType::Tuple(vec![

src/amm/mod.rs

@@ -1,5 +1,4 @@
 pub mod camelot_v3;
-pub mod common;
 pub mod consts;
 pub mod curve;
 pub mod erc_4626;
@@ -31,7 +30,7 @@ use crate::errors::{AMMError, ArithmeticError, EventLogError, SwapSimulationErro
 
 use self::{
     camelot_v3::CamelotV3Pool, curve::CurvePool, erc_4626::ERC4626Vault, uniswap_v2::UniswapV2Pool,
-    uniswap_v3::UniswapV3Pool, ve33::Ve33Pool,
+    uniswap_v3::UniswapV3Pool,
 };
 
 sol! {
@@ -252,7 +251,6 @@ macro_rules! amm {
 amm!(
     UniswapV2Pool,
     UniswapV3Pool,
-    Ve33Pool,
     ERC4626Vault,
     CamelotV3Pool,
     CurvePool