Remove unused config options / features (#4156)

# Description
This started out as an investigation into speeding up deny-listed token
filtering in the auction building process but I realized that there is
still some unfinished work of migrating away from the tracing based bad
token detection.

We already moved away from that bad token detection mechanism a while
ago but I didn't fully delete all the related code yet in case the new
mechanism doesn't work well enough. Since then we've been running the
services without the feature for many months so it's time to remove that
stuff now.

We are deleting so much here because only the tracing detector was using
all the logic to find owners of certain tokens onchain so that also went
with it.
Once that was done I also went ahead and tried to find any other args
that are unused.

# Changes
- remove `tracing_url` parameter which made the tracing bad token
detector unused
- removed tracing detector which made token owner finding stuff unused
- removed token owner finding stuff which made liquidity source configs
unused
- removed any other args that weren't used

## How to test
compiler

Author: MartinquaXD

crates/autopilot/src/arguments.rs

@@ -6,7 +6,6 @@ use {
     clap::ValueEnum,
     shared::{
         arguments::{FeeFactor, display_list, display_option, display_secret_option},
-        bad_token::token_owner_finder,
         http_client,
         price_estimation::{self, NativePriceEstimators},
     },
@@ -31,9 +30,6 @@ pub struct Arguments {
     #[clap(flatten)]
     pub http_client: http_client::Arguments,
 
-    #[clap(flatten)]
-    pub token_owner_finder: token_owner_finder::Arguments,
-
     #[clap(flatten)]
     pub price_estimation: price_estimation::Arguments,
 
@@ -54,11 +50,6 @@ pub struct Arguments {
     #[clap(long, env)]
     pub ethflow_indexing_start: Option<u64>,
 
-    /// A tracing Ethereum node URL to connect to, allowing a separate node URL
-    /// to be used exclusively for tracing calls.
-    #[clap(long, env)]
-    pub tracing_node_url: Option<Url>,
-
     #[clap(long, env, default_value = "0.0.0.0:9589")]
     pub metrics_address: SocketAddr,
 
@@ -293,10 +284,8 @@ impl std::fmt::Display for Arguments {
             shared,
             order_quoting,
             http_client,
-            token_owner_finder,
             price_estimation,
             database_pool,
-            tracing_node_url,
             ethflow_contracts,
             ethflow_indexing_start,
             metrics_address,
@@ -341,10 +330,8 @@ impl std::fmt::Display for Arguments {
         write!(f, "{shared}")?;
         write!(f, "{order_quoting}")?;
         write!(f, "{http_client}")?;
-        write!(f, "{token_owner_finder}")?;
         write!(f, "{price_estimation}")?;
         write!(f, "{database_pool}")?;
-        display_option(f, "tracing_node_url", tracing_node_url)?;
         writeln!(f, "ethflow_contracts: {ethflow_contracts:?}")?;
         writeln!(f, "ethflow_indexing_start: {ethflow_indexing_start:?}")?;
         writeln!(f, "metrics_address: {metrics_address}")?;

crates/autopilot/src/run.rs

@@ -27,21 +27,17 @@ use {
     alloy::{eips::BlockNumberOrTag, primitives::Address, providers::Provider},
     chain::Chain,
     clap::Parser,
-    contracts::alloy::{BalancerV2Vault, GPv2Settlement, IUniswapV3Factory, WETH9},
+    contracts::alloy::{BalancerV2Vault, GPv2Settlement, WETH9},
     ethrpc::{Web3, block_stream::block_number_to_block_number_hash},
-    futures::StreamExt,
     model::DomainSeparator,
     num::ToPrimitive,
     observe::metrics::LivenessChecking,
     shared::{
         account_balances::{self, BalanceSimulator},
         arguments::tracing_config,
         bad_token::{
-            cache::CachingDetector,
             instrumented::InstrumentedBadTokenDetectorExt,
             list_based::{ListBasedDetector, UnknownTokenStrategy},
-            token_owner_finder,
-            trace_call::TraceCallDetector,
         },
         baseline_solver::BaseTokens,
         code_fetching::CachedCodeFetcher,
@@ -51,7 +47,6 @@ use {
             factory::{self, PriceEstimatorFactory},
             native::NativePriceEstimating,
         },
-        sources::{BaselineSource, uniswap_v2::UniV2BaselineSourceParameters},
         token_info::{CachedTokenInfoFetcher, TokenInfoFetcher},
         token_list::{AutoUpdatingTokenList, TokenListConfiguration},
     },
@@ -240,14 +235,6 @@ pub async fn run(args: Arguments, shutdown_controller: ShutdownController) {
         }
         addr
     });
-    let vault =
-        vault_address.map(|address| BalancerV2Vault::Instance::new(address, web3.provider.clone()));
-
-    let uniswapv3_factory = IUniswapV3Factory::Instance::deployed(&web3.provider)
-        .instrument(info_span!("uniswapv3_deployed"))
-        .await
-        .inspect_err(|err| tracing::warn!(%err, "error while fetching IUniswapV3Factory instance"))
-        .ok();
 
     let chain = Chain::try_from(chain_id).expect("incorrect chain ID");
 
@@ -275,27 +262,6 @@ pub async fn run(args: Arguments, shutdown_controller: ShutdownController) {
         .expect("failed to create gas price estimator"),
     );
 
-    let baseline_sources = args
-        .shared
-        .baseline_sources
-        .clone()
-        .unwrap_or_else(|| shared::sources::defaults_for_network(&chain));
-    tracing::info!(?baseline_sources, "using baseline sources");
-    let univ2_sources = baseline_sources
-        .iter()
-        .filter_map(|source: &BaselineSource| {
-            UniV2BaselineSourceParameters::from_baseline_source(*source, &chain_id.to_string())
-        })
-        .chain(args.shared.custom_univ2_baseline_sources.iter().copied());
-    let pair_providers: Vec<_> = futures::stream::iter(univ2_sources)
-        .then(|source: UniV2BaselineSourceParameters| {
-            let web3 = &web3;
-            async move { source.into_source(web3).await.unwrap().pair_provider }
-        })
-        .collect()
-        .instrument(info_span!("pair_providers"))
-        .await;
-
     let base_tokens = Arc::new(BaseTokens::new(
         *eth.contracts().weth().address(),
         &args.shared.base_tokens,
@@ -305,39 +271,11 @@ pub async fn run(args: Arguments, shutdown_controller: ShutdownController) {
     allowed_tokens.push(model::order::BUY_ETH_ADDRESS);
     let unsupported_tokens = args.unsupported_tokens.clone();
 
-    let finder = token_owner_finder::init(
-        &args.token_owner_finder,
-        web3.clone(),
-        &chain,
-        &http_factory,
-        &pair_providers,
-        vault.as_ref(),
-        uniswapv3_factory.as_ref(),
-        &base_tokens,
-        *eth.contracts().settlement().address(),
-    )
-    .instrument(info_span!("token_owner_finder_init"))
-    .await
-    .expect("failed to initialize token owner finders");
-
-    let trace_call_detector = args.tracing_node_url.as_ref().map(|tracing_node_url| {
-        CachingDetector::new(
-            Box::new(TraceCallDetector::new(
-                shared::ethrpc::web3(&args.shared.ethrpc, tracing_node_url, "trace"),
-                *eth.contracts().settlement().address(),
-                finder,
-            )),
-            args.shared.token_quality_cache_expiry,
-            args.shared.token_quality_cache_prefetch_time,
-        )
-    });
     let bad_token_detector = Arc::new(
         ListBasedDetector::new(
             allowed_tokens,
             unsupported_tokens,
-            trace_call_detector
-                .map(|detector| UnknownTokenStrategy::Forward(detector))
-                .unwrap_or(UnknownTokenStrategy::Allow),
+            UnknownTokenStrategy::Allow,
         )
         .instrumented(),
     );

crates/e2e/src/setup/services.rs

@@ -157,9 +157,7 @@ impl<'a> Services<'a> {
 
     fn api_autopilot_solver_arguments(&self) -> impl Iterator<Item = String> + use<> {
         [
-            "--baseline-sources=None".to_string(),
             "--network-block-interval=1s".to_string(),
-            "--solver-competition-auth=super_secret_key".to_string(),
             format!(
                 "--settlement-contract-address={:?}",
                 self.contracts.gp_settlement.address()

crates/orderbook/src/arguments.rs

@@ -3,8 +3,7 @@ use {
     chrono::{DateTime, Utc},
     reqwest::Url,
     shared::{
-        arguments::{FeeFactor, display_option, display_secret_option},
-        bad_token::token_owner_finder,
+        arguments::{FeeFactor, display_secret_option},
         http_client,
         price_estimation::{self, NativePriceEstimators},
     },
@@ -22,20 +21,12 @@ pub struct Arguments {
     #[clap(flatten)]
     pub http_client: http_client::Arguments,
 
-    #[clap(flatten)]
-    pub token_owner_finder: token_owner_finder::Arguments,
-
     #[clap(flatten)]
     pub price_estimation: price_estimation::Arguments,
 
     #[clap(flatten)]
     pub database_pool: shared::arguments::DatabasePoolConfig,
 
-    /// A tracing Ethereum node URL to connect to, allowing a separate node URL
-    /// to be used exclusively for tracing calls.
-    #[clap(long, env)]
-    pub tracing_node_url: Option<Url>,
-
     #[clap(long, env, default_value = "0.0.0.0:8080")]
     pub bind_address: SocketAddr,
 
@@ -115,11 +106,6 @@ pub struct Arguments {
     #[clap(long, env, action = clap::ArgAction::Set, default_value = "false")]
     pub eip1271_skip_creation_validation: bool,
 
-    /// If solvable orders haven't been successfully updated in this many blocks
-    /// attempting to get them errors and our liveness check fails.
-    #[clap(long, env, default_value = "24")]
-    pub solvable_orders_max_update_age_blocks: u64,
-
     /// Max number of limit orders per user.
     #[clap(long, env, default_value = "10")]
     pub max_limit_orders_per_user: u64,
@@ -182,10 +168,8 @@ impl std::fmt::Display for Arguments {
             shared,
             order_quoting,
             http_client,
-            token_owner_finder,
             price_estimation,
             database_pool,
-            tracing_node_url,
             bind_address,
             min_order_validity_period,
             max_order_validity_period,
@@ -195,7 +179,6 @@ impl std::fmt::Display for Arguments {
             banned_users_max_cache_size,
             allowed_tokens,
             eip1271_skip_creation_validation,
-            solvable_orders_max_update_age_blocks,
             native_price_estimators,
             fast_price_estimation_results_required,
             max_limit_orders_per_user,
@@ -213,10 +196,8 @@ impl std::fmt::Display for Arguments {
         write!(f, "{shared}")?;
         write!(f, "{order_quoting}")?;
         write!(f, "{http_client}")?;
-        write!(f, "{token_owner_finder}")?;
         write!(f, "{price_estimation}")?;
         write!(f, "{database_pool}")?;
-        display_option(f, "tracing_node_url", tracing_node_url)?;
         writeln!(f, "bind_address: {bind_address}")?;
         let _intentionally_ignored = db_url;
         writeln!(f, "db_url: SECRET")?;
@@ -244,10 +225,6 @@ impl std::fmt::Display for Arguments {
             f,
             "eip1271_skip_creation_validation: {eip1271_skip_creation_validation}"
         )?;
-        writeln!(
-            f,
-            "solvable_orders_max_update_age_blocks: {solvable_orders_max_update_age_blocks}",
-        )?;
         writeln!(f, "native_price_estimators: {native_price_estimators}")?;
         writeln!(
             f,

crates/orderbook/src/run.rs

@@ -18,11 +18,9 @@ use {
         ChainalysisOracle,
         GPv2Settlement,
         HooksTrampoline,
-        IUniswapV3Factory,
         WETH9,
         support::Balances,
     },
-    futures::StreamExt,
     model::{DomainSeparator, order::BUY_ETH_ADDRESS},
     num::ToPrimitive,
     observe::metrics::{DEFAULT_METRICS_PORT, serve_metrics},
@@ -31,11 +29,8 @@ use {
         account_balances::{self, BalanceSimulator},
         arguments::tracing_config,
         bad_token::{
-            cache::CachingDetector,
             instrumented::InstrumentedBadTokenDetectorExt,
             list_based::{ListBasedDetector, UnknownTokenStrategy},
-            token_owner_finder,
-            trace_call::TraceCallDetector,
         },
         baseline_solver::BaseTokens,
         code_fetching::CachedCodeFetcher,
@@ -50,7 +45,6 @@ use {
             native::NativePriceEstimating,
         },
         signature_validator,
-        sources::{self, BaselineSource, uniswap_v2::UniV2BaselineSourceParameters},
         token_info::{CachedTokenInfoFetcher, TokenInfoFetcher},
     },
     std::{future::Future, net::SocketAddr, sync::Arc, time::Duration},
@@ -154,8 +148,6 @@ pub async fn run(args: Arguments) {
             }
         }
     });
-    let vault =
-        vault_address.map(|address| BalancerV2Vault::Instance::new(address, web3.provider.clone()));
 
     let hooks_contract = match args.shared.hooks_contract_address {
         Some(address) => HooksTrampoline::Instance::new(address, web3.provider.clone()),
@@ -204,26 +196,6 @@ pub async fn run(args: Arguments) {
         .expect("failed to create gas price estimator"),
     ));
 
-    let baseline_sources = args
-        .shared
-        .baseline_sources
-        .clone()
-        .unwrap_or_else(|| sources::defaults_for_network(&chain));
-    tracing::info!(?baseline_sources, "using baseline sources");
-    let univ2_sources = baseline_sources
-        .iter()
-        .filter_map(|source: &BaselineSource| {
-            UniV2BaselineSourceParameters::from_baseline_source(*source, &chain_id.to_string())
-        })
-        .chain(args.shared.custom_univ2_baseline_sources.iter().copied());
-    let pair_providers: Vec<_> = futures::stream::iter(univ2_sources)
-        .then(|source: UniV2BaselineSourceParameters| {
-            let web3 = &web3;
-            async move { source.into_source(web3).await.unwrap().pair_provider }
-        })
-        .collect()
-        .await;
-
     let base_tokens = Arc::new(BaseTokens::new(
         *native_token.address(),
         &args.shared.base_tokens,
@@ -233,43 +205,11 @@ pub async fn run(args: Arguments) {
     allowed_tokens.push(BUY_ETH_ADDRESS);
     let unsupported_tokens = args.unsupported_tokens.clone();
 
-    let uniswapv3_factory = IUniswapV3Factory::Instance::deployed(&web3.provider)
-        .await
-        .inspect_err(|err| tracing::warn!(%err, "error while fetching IUniswapV3Factory instance"))
-        .ok();
-
-    let finder = token_owner_finder::init(
-        &args.token_owner_finder,
-        web3.clone(),
-        &chain,
-        &http_factory,
-        &pair_providers,
-        vault.as_ref(),
-        uniswapv3_factory.as_ref(),
-        &base_tokens,
-        *settlement_contract.address(),
-    )
-    .await
-    .expect("failed to initialize token owner finders");
-
-    let trace_call_detector = args.tracing_node_url.as_ref().map(|tracing_node_url| {
-        CachingDetector::new(
-            Box::new(TraceCallDetector::new(
-                shared::ethrpc::web3(&args.shared.ethrpc, tracing_node_url, "trace"),
-                *settlement_contract.address(),
-                finder,
-            )),
-            args.shared.token_quality_cache_expiry,
-            args.shared.token_quality_cache_prefetch_time,
-        )
-    });
     let bad_token_detector = Arc::new(
         ListBasedDetector::new(
             allowed_tokens,
             unsupported_tokens,
-            trace_call_detector
-                .map(|detector| UnknownTokenStrategy::Forward(detector))
-                .unwrap_or(UnknownTokenStrategy::Allow),
+            UnknownTokenStrategy::Allow,
         )
         .instrumented(),
     );